diff --git a/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile b/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile
index 6f09dbc97908..05c8b4814297 100644
--- a/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile
+++ b/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile
@@ -1,5 +1,9 @@
 FROM bitnami/minideb:bullseye as builder
 
+ARG TARGETARCH
+
+ENV OS_ARCH="${TARGETARCH:-amd64}"
+
 COPY prebuildfs /
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -7,24 +11,30 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl gzip tar
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f wavefront-hpa-adapter-0.9.9-2-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/wavefront-hpa-adapter-0.9.9-2-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f wavefront-hpa-adapter-0.9.9-2-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/wavefront-hpa-adapter-0.9.9-2-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/wavefront-hpa-adapter-0.9.9-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "7aedbc86b723387f664f50cef0b9401497eccf50b4e36fdb8672310d52eb828c  wavefront-hpa-adapter-0.9.9-2-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf wavefront-hpa-adapter-0.9.9-2-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
-    rm -rf wavefront-hpa-adapter-0.9.9-2-linux-amd64-debian-11.tar.gz
+    sha256sum -c wavefront-hpa-adapter-0.9.9-2-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf wavefront-hpa-adapter-0.9.9-2-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf wavefront-hpa-adapter-0.9.9-2-linux-${OS_ARCH}-debian-11.tar.gz
 
 ######
 
 FROM scratch
 
+ARG TARGETARCH
+
+ENV OS_ARCH="${TARGETARCH:-amd64}"
+
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="0.9.9-scratch-r6" \
+      org.opencontainers.image.ref.name="0.9.9-scratch-r7" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/wavefront-hpa-adapter" \
       org.opencontainers.image.title="wavefront-hpa-adapter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="0.9.9"
+
 COPY prebuildfs /
 COPY rootfs /
 COPY --from=builder /opt/bitnami/wavefront-hpa-adapter/bin/wavefront-adapter /wavefront-adapter
diff --git a/bitnami/wavefront-hpa-adapter/README.md b/bitnami/wavefront-hpa-adapter/README.md
index 10f4f638068f..d315d6d91a07 100644
--- a/bitnami/wavefront-hpa-adapter/README.md
+++ b/bitnami/wavefront-hpa-adapter/README.md
@@ -28,7 +28,7 @@ $ docker run --name wavefront-hpa-adapter bitnami/wavefront-hpa-adapter:latest
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`0`, `0-scratch`, `0.9.9`, `0.9.9-scratch-r6`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile)
+* [`0`, `0-scratch`, `0.9.9`, `0.9.9-scratch-r7`, `latest` (0/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wavefront-hpa-adapter/0/scratch/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).