diff --git a/bitnami/wavefront-prometheus-storage-adapter/1/debian-11/Dockerfile b/bitnami/wavefront-prometheus-storage-adapter/1/debian-11/Dockerfile
index 5690d0cdaf1c..db733a8cb7cc 100644
--- a/bitnami/wavefront-prometheus-storage-adapter/1/debian-11/Dockerfile
+++ b/bitnami/wavefront-prometheus-storage-adapter/1/debian-11/Dockerfile
@@ -1,28 +1,32 @@
 FROM docker.io/bitnami/minideb:bullseye
-ENV HOME="/" \
-    OS_ARCH="amd64" \
-    OS_FLAVOUR="debian-11" \
-    OS_NAME="linux"
+
+ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="1.0.5-debian-11-r34" \
+      org.opencontainers.image.ref.name="1.0.5-debian-11-r35" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/wavefront-prometheus-storage-adapter" \
       org.opencontainers.image.title="wavefront-prometheus-storage-adapter" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.0.5"
 
+ENV HOME="/" \
+    OS_ARCH="${TARGETARCH:-amd64}" \
+    OS_FLAVOUR="debian-11" \
+    OS_NAME="linux"
+
 COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl gzip procps tar
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
-    if [ ! -f wavefront-prometheus-storage-adapter-1.0.5-153-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/wavefront-prometheus-storage-adapter-1.0.5-153-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f wavefront-prometheus-storage-adapter-1.0.5-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/wavefront-prometheus-storage-adapter-1.0.5-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/wavefront-prometheus-storage-adapter-1.0.5-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "0c81fe01fcf84793a5fc5448d293ea83d986056ae8eb6b71cf4f80abc799f11d  wavefront-prometheus-storage-adapter-1.0.5-153-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf wavefront-prometheus-storage-adapter-1.0.5-153-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
-    rm -rf wavefront-prometheus-storage-adapter-1.0.5-153-linux-amd64-debian-11.tar.gz
+    sha256sum -c wavefront-prometheus-storage-adapter-1.0.5-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf wavefront-prometheus-storage-adapter-1.0.5-153-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf wavefront-prometheus-storage-adapter-1.0.5-153-linux-${OS_ARCH}-debian-11.tar.gz
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
diff --git a/bitnami/wavefront-prometheus-storage-adapter/README.md b/bitnami/wavefront-prometheus-storage-adapter/README.md
index f7aefa88d155..c4b0e3cda656 100644
--- a/bitnami/wavefront-prometheus-storage-adapter/README.md
+++ b/bitnami/wavefront-prometheus-storage-adapter/README.md
@@ -28,7 +28,7 @@ $ docker run --name wavefront-prometheus-storage-adapter bitnami/wavefront-prome
 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/).
 
 
-* [`1`, `1-debian-11`, `1.0.5`, `1.0.5-debian-11-r34`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wavefront-prometheus-storage-adapter/1/debian-11/Dockerfile)
+* [`1`, `1-debian-11`, `1.0.5`, `1.0.5-debian-11-r35`, `latest` (1/debian-11/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/wavefront-prometheus-storage-adapter/1/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).