diff --git a/bitnami/argo-workflow-exec/4.0/debian-12/Dockerfile b/bitnami/argo-workflow-exec/4.0/debian-12/Dockerfile
index a8593efc15ad..011b7ac4cebd 100644
--- a/bitnami/argo-workflow-exec/4.0/debian-12/Dockerfile
+++ b/bitnami/argo-workflow-exec/4.0/debian-12/Dockerfile
@@ -7,13 +7,13 @@ ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-07-02T07:01:50Z" \
+      org.opencontainers.image.created="2026-07-07T14:19:38Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/argo-workflow-exec/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/argo-workflow-exec" \
       org.opencontainers.image.title="argo-workflow-exec" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="4.0.6"
+      org.opencontainers.image.version="4.0.7"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -30,7 +30,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     COMPONENTS=( \
       "yq-4.53.3-1-linux-${OS_ARCH}-debian-12" \
       "kubectl-1.36.2-0-linux-${OS_ARCH}-debian-12" \
-      "argo-workflow-exec-4.0.6-0-linux-${OS_ARCH}-debian-12" \
+      "argo-workflow-exec-4.0.7-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -49,9 +49,9 @@ RUN uninstall_packages curl
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/argo-workflow-exec/postunpack.sh
-ENV APP_VERSION="4.0.6" \
+ENV APP_VERSION="4.0.7" \
     BITNAMI_APP_NAME="argo-workflow-exec" \
-    IMAGE_REVISION="1" \
+    IMAGE_REVISION="0" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/kubectl/bin:/opt/bitnami/argo-workflow-exec/bin:/opt/bitnami/argo-workflow-exec/hack:$PATH"
 
 USER 1001
diff --git a/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.6-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.6-0-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index af97287550a6..000000000000
--- a/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.6-0-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-c459cceb6c4c35d15c186f2a27e4e5055c6512e5a3af535a14da36a181a022ac  argo-workflow-exec-4.0.6-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.6-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.6-0-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index d13677bb167b..000000000000
--- a/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.6-0-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-44d9dd746c37110ff9107e47b516eb525a0bf561d7e930d9ef0875316a1ee012  argo-workflow-exec-4.0.6-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.7-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.7-0-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..a3fa66fe8f0d
--- /dev/null
+++ b/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.7-0-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+9001adcfa9102d4152e1fb65516b2b3beb71245762c7a477e4672616530b1098  argo-workflow-exec-4.0.7-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.7-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.7-0-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..afbf62a07df4
--- /dev/null
+++ b/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/checksums/argo-workflow-exec-4.0.7-0-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+220cdd91b882f0109155a108291251366b8593c3427e44ca8a1bcf30a5972cd7  argo-workflow-exec-4.0.7-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index a8293800d55c..c1d60a5c5f42 100644
--- a/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/argo-workflow-exec/4.0/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -424,3 +424,23 @@ EOF
 WantedBy=bitnami.service
 EOF
 }
+
+########################
+# Register a SIGTERM handler that forwards the signal to all child processes.
+# Should be called at the start of run.sh, before launching any background processes.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+service_register_term_forwarder() {
+    _service_forward_term() {
+        warn "Caught signal SIGTERM, passing it to child processes..."
+        pgrep -P $$ | xargs kill -TERM 2>/dev/null
+        wait
+        exit $?
+    }
+    trap _service_forward_term TERM
+}