diff --git a/bitnami/rmq-default-credential-updater/1/scratch/Dockerfile b/bitnami/rmq-default-credential-updater/1/scratch/Dockerfile
index b2a36bb4401b..d90fb5f76e18 100644
--- a/bitnami/rmq-default-credential-updater/1/scratch/Dockerfile
+++ b/bitnami/rmq-default-credential-updater/1/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 rmq-default-credential-updater-1.0.2-153-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/rmq-default-credential-updater-1.0.2-153-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f rmq-default-credential-updater-1.0.2-153-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/rmq-default-credential-updater-1.0.2-153-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/rmq-default-credential-updater-1.0.2-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "ee1409b2aa82d95f769d5b55f72c6dd86836ebfddb2af3aa74406befdb2b8597  rmq-default-credential-updater-1.0.2-153-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf rmq-default-credential-updater-1.0.2-153-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
-    rm -rf rmq-default-credential-updater-1.0.2-153-linux-amd64-debian-11.tar.gz
+    sha256sum -c rmq-default-credential-updater-1.0.2-153-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf rmq-default-credential-updater-1.0.2-153-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf rmq-default-credential-updater-1.0.2-153-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="1.0.2-scratch-r8" \
+      org.opencontainers.image.ref.name="1.0.2-scratch-r9" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/rmq-default-credential-updater" \
       org.opencontainers.image.title="rmq-default-credential-updater" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.0.2"
+
 COPY prebuildfs /
 COPY rootfs /
 COPY --from=builder /opt/bitnami/rmq-default-credential-updater/bin/default-user-credential-updater /default-user-credential-updater
diff --git a/bitnami/rmq-default-credential-updater/README.md b/bitnami/rmq-default-credential-updater/README.md
index 952362f9a90e..83ade6e57cab 100644
--- a/bitnami/rmq-default-credential-updater/README.md
+++ b/bitnami/rmq-default-credential-updater/README.md
@@ -28,7 +28,7 @@ $ docker run --name rmq-default-credential-updater bitnami/rmq-default-credentia
 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-scratch`, `1.0.2`, `1.0.2-scratch-r8`, `latest` (1/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/rmq-default-credential-updater/1/scratch/Dockerfile)
+- [`1`, `1-scratch`, `1.0.2`, `1.0.2-scratch-r9`, `latest` (1/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/rmq-default-credential-updater/1/scratch/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).