diff --git a/bitnami/argo-workflow-cli/3/scratch/Dockerfile b/bitnami/argo-workflow-cli/3/scratch/Dockerfile
index c01e1b751fea..d38a4a9004d2 100644
--- a/bitnami/argo-workflow-cli/3/scratch/Dockerfile
+++ b/bitnami/argo-workflow-cli/3/scratch/Dockerfile
@@ -1,8 +1,26 @@
-FROM scratch
+FROM bitnami/minideb:bullseye as builder
 
 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.8-0-linux-amd64-debian-11.tar.gz && \
+    echo "a85bf6fe4db821f176c69ff72d4783913ae3c176cafcbc38f98012ea0e35a3c9  /tmp/bitnami/pkg/cache/argo-workflows-3.3.8-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/argo-workflows-3.3.8-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.8-0-linux-amd64-debian-11.tar.gz
+
+######
+
+FROM scratch
+
+COPY prebuildfs /
 COPY rootfs /
+COPY --from=builder /opt/bitnami/argo-workflows/hack/nsswitch.conf  /etc/nsswitch.conf
+COPY --from=builder /opt/bitnami/argo-workflows/bin/argo /argo
+COPY --from=builder /opt/bitnami/argo-workflows/hack/ssh_known_hosts /etc/ssh/ssh_known_hosts
 
 USER 1001
+
 ENTRYPOINT [ "/argo" ]
diff --git a/bitnami/argo-workflow-cli/3/scratch/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/argo-workflow-cli/3/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
index 81138d51e035..a725ddaa2d3a 100644
--- a/bitnami/argo-workflow-cli/3/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/argo-workflow-cli/3/scratch/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,7 +1,9 @@
 {
     "argo-workflows": {
-        "digest": "57d51b6da34bb7f3bf6e571f4f17e5759b892d4cb22281542418971fb1dfef43",
-        "type": "BLACKSMITH",
-        "version": "3.3.8"
+        "arch": "amd64",
+        "digest": "a85bf6fe4db821f176c69ff72d4783913ae3c176cafcbc38f98012ea0e35a3c9",
+        "distro": "debian-11",
+        "type": "NAMI",
+        "version": "3.3.8-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/argo-workflow-cli/3/scratch/rootfs/ /etc/nsswitch.conf b/bitnami/argo-workflow-cli/3/scratch/rootfs/ /etc/nsswitch.conf
deleted file mode 100644
index 21fae7381fc9..000000000000
--- a/bitnami/argo-workflow-cli/3/scratch/rootfs/ /etc/nsswitch.conf	
+++ /dev/null
@@ -1 +0,0 @@
-hosts: files dns
diff --git a/bitnami/argo-workflow-cli/3/scratch/rootfs/etc/ssh/ssh_known_hosts b/bitnami/argo-workflow-cli/3/scratch/rootfs/etc/ssh/ssh_known_hosts
deleted file mode 100644
index a89bb62154a5..000000000000
--- a/bitnami/argo-workflow-cli/3/scratch/rootfs/etc/ssh/ssh_known_hosts
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file was automatically generated. DO NOT EDIT
-bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
-github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
-github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=
-gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
-gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
-ssh.dev.azure.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
-vs-ssh.visualstudio.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
diff --git a/bitnami/argo-workflow-cli/README.md b/bitnami/argo-workflow-cli/README.md
index ce0ee0be983b..c0e7cbfddeba 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.8`, `3.3.8-scratch-r0`, `latest` (3/scratch/Dockerfile)](https://github.com/bitnami/bitnami-docker-argo-workflows/blob/3.3.8-scratch-r0/3/scratch/      Dockerfile)
+* [`3`, `3-scratch`, `3.3.8`, `3.3.8-scratch-r1`, `latest` (3/scratch/Dockerfile)](https://github.com/bitnami/bitnami-docker-argo-workflows/blob/3.3.8-scratch-r1/3/scratch/      Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/argo-workflow-cli GitHub repo](https://github.com/bitnami/bitnami-docker-argo-workflow-cli).