diff --git a/bitnami/argo-workflow-cli/3/scratch/Dockerfile b/bitnami/argo-workflow-cli/3/scratch/Dockerfile
index e42b39485830..3589c1181d49 100644
--- a/bitnami/argo-workflow-cli/3/scratch/Dockerfile
+++ b/bitnami/argo-workflow-cli/3/scratch/Dockerfile
@@ -5,11 +5,12 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install required system packages and dependencies
-RUN install_packages ca-certificates gzip tar wget
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/argo-workflows-3.3.9-0-linux-amd64-debian-11.tar.gz && \
-    echo "762cf01060577fe80a7031a555d14ca65d8fa7faa5e65bd05a397774fb1cb2aa  /tmp/bitnami/pkg/cache/argo-workflows-3.3.9-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/argo-workflows-3.3.9-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/argo-workflows-3.3.9-0-linux-amd64-debian-11.tar.gz
+RUN install_packages ca-certificates curl gzip tar
+RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+    curl -SsLf https://downloads.bitnami.com/files/stacksmith/argo-workflows-3.3.9-0-linux-amd64-debian-11.tar.gz -o argo-workflows-3.3.9-0-linux-amd64-debian-11.tar.gz && \
+    echo "762cf01060577fe80a7031a555d14ca65d8fa7faa5e65bd05a397774fb1cb2aa  argo-workflows-3.3.9-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf argo-workflows-3.3.9-0-linux-amd64-debian-11.tar.gz -C /opt/bitnami --strip-components=2 --wildcards '*/files' && \
+    rm -rf argo-workflows-3.3.9-0-linux-amd64-debian-11.tar.gz
 
 ######
 
@@ -17,6 +18,7 @@ FROM scratch
 
 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.source="https://github.com/bitnami/containers/tree/main/bitnami/argo-workflow-cli" \
       org.opencontainers.image.title="argo-workflow-cli" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/argo-workflow-cli/3/scratch/tags-info.yaml b/bitnami/argo-workflow-cli/3/scratch/tags-info.yaml
new file mode 100644
index 000000000000..f35a80e75359
--- /dev/null
+++ b/bitnami/argo-workflow-cli/3/scratch/tags-info.yaml
@@ -0,0 +1,5 @@
+rolling-tags:
+  - "3"
+  - "3-scratch"
+  - "3.3.9"
+  - "latest"
diff --git a/bitnami/argo-workflow-cli/README.md b/bitnami/argo-workflow-cli/README.md
index 9ddbc868d5a4..5117e80bdd39 100644
--- a/bitnami/argo-workflow-cli/README.md
+++ b/bitnami/argo-workflow-cli/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-r0`, `latest` (3/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/argo-workflows/3/scratch/      Dockerfile)
+* [`3`, `3-scratch`, `3.3.9`, `3.3.9-scratch-r1`, `latest` (3/scratch/Dockerfile)](https://github.com/bitnami/containers/blob/main/bitnami/argo-workflows/3/scratch/      Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/containers GitHub repo](https://github.com/bitnami/containers).