diff --git a/bitnami/argo-workflow-controller/3/scratch/Dockerfile b/bitnami/argo-workflow-controller/3/scratch/Dockerfile
index cf9bee405d24..f11ecb54ee5e 100644
--- a/bitnami/argo-workflow-controller/3/scratch/Dockerfile
+++ b/bitnami/argo-workflow-controller/3/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 argo-workflow-controller-3.3.9-1-linux-amd64-debian-11.tar.gz ]; then \
-      curl -SsLf https://downloads.bitnami.com/files/stacksmith/argo-workflow-controller-3.3.9-1-linux-amd64-debian-11.tar.gz -O ; \
+    if [ ! -f argo-workflow-controller-3.3.9-1-linux-${OS_ARCH}-debian-11.tar.gz ]; then \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/argo-workflow-controller-3.3.9-1-linux-${OS_ARCH}-debian-11.tar.gz -O ; \
+      curl -SsLf https://downloads.bitnami.com/files/stacksmith/argo-workflow-controller-3.3.9-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 -O ; \
     fi && \
-    echo "b147f60cb95cc8333835860bc3b1d1401956ad37fbbf2c794f1195b1df7351cf  argo-workflow-controller-3.3.9-1-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf argo-workflow-controller-3.3.9-1-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
-    rm -rf argo-workflow-controller-3.3.9-1-linux-amd64-debian-11.tar.gz
+    sha256sum -c argo-workflow-controller-3.3.9-1-linux-${OS_ARCH}-debian-11.tar.gz.sha256 && \
+    tar -zxf argo-workflow-controller-3.3.9-1-linux-${OS_ARCH}-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+    rm -rf argo-workflow-controller-3.3.9-1-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="3.3.9-scratch-r1" \
+      org.opencontainers.image.ref.name="3.3.9-scratch-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/argo-workflow-controller" \
       org.opencontainers.image.title="argo-workflow-controller" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.3.9"
+
 COPY prebuildfs /
 COPY rootfs /
 COPY --from=builder /opt/bitnami/argo-workflow-controller/bin/workflow-controller /workflow-controller
diff --git a/bitnami/argo-workflow-controller/README.md b/bitnami/argo-workflow-controller/README.md
index 9ad866f5e106..d94c3ccc6856 100644
--- a/bitnami/argo-workflow-controller/README.md
+++ b/bitnami/argo-workflow-controller/README.md
@@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 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/).
 
 
-* [`3`, `3-scratch`, `3.3.9`, `3.3.9-scratch-r1`, `latest` (3/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/argo-workflow-controller/3/scratch/      Dockerfile)
+* [`3`, `3-scratch`, `3.3.9`, `3.3.9-scratch-r2`, `latest` (3/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/argo-workflow-controller/3/scratch/      Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).