diff --git a/bitnami/valkey/9.1/debian-12/Dockerfile b/bitnami/valkey/9.1/debian-12/Dockerfile
index 7a03141a59ea..70377e0be427 100644
--- a/bitnami/valkey/9.1/debian-12/Dockerfile
+++ b/bitnami/valkey/9.1/debian-12/Dockerfile
@@ -7,7 +7,7 @@ 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-06-29T20:56:14Z" \
+      org.opencontainers.image.created="2026-07-08T07:47:11Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/valkey/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/valkey" \
@@ -28,8 +28,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "wait-for-port-1.0.10-13-linux-${OS_ARCH}-debian-12" \
-      "valkey-9.1.0-2-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.10-14-linux-${OS_ARCH}-debian-12" \
+      "valkey-9.1.0-3-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -52,7 +52,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/valkey/postunpack.sh
 ENV APP_VERSION="9.1.0" \
     BITNAMI_APP_NAME="valkey" \
-    IMAGE_REVISION="5" \
+    IMAGE_REVISION="6" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/valkey/bin:$PATH"
 
 EXPOSE 6379
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-2-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index f599fa0a4e88..000000000000
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-2-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-b308957eaa3501ee7117cab81e4ed7b5cd273557a1d614fe66bfa9939088ed5f  valkey-9.1.0-2-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-2-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 1ccdf8c99cb8..000000000000
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-2-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-525f7cbd2bbb18406956de2026f91cfbf5d7deb8b4181b5bbd42125e80798864  valkey-9.1.0-2-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-3-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..3c22ff563209
--- /dev/null
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-3-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+a64f1c055297646832af8c3d6d6d7c283bf3289c41a95e9e502cf96ece1e2905  valkey-9.1.0-3-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-3-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..d7b06ff1775d
--- /dev/null
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/valkey-9.1.0-3-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+680a49d994b3ff1075578542e710a24e648110a9e2834b544fbe5edd310e0fe9  valkey-9.1.0-3-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-13-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-13-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 508533b8af2b..000000000000
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-13-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-a6e453ebb01a25354771584cac544f1c7142ffcf81b9d88fb0ab5d5e9d23ba54  wait-for-port-1.0.10-13-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-13-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-13-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index a4929821d088..000000000000
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-13-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-e10e80f03ddd46d5fa479f3ca6cf24e6317540202cb244769167a91b3afbc9fc  wait-for-port-1.0.10-13-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..a85effe773e4
--- /dev/null
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+4ea516dd6f57b3b33883e810ddb8b4dafa310948100434fd5a6272364d44329f  wait-for-port-1.0.10-14-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..8373c7e8a532
--- /dev/null
+++ b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+63a1be9dccbce0765fdaa60e122d8a683a72f28bcc418e3a4b4121174f3ecf4d  wait-for-port-1.0.10-14-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index a8293800d55c..c1d60a5c5f42 100644
--- a/bitnami/valkey/9.1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/valkey/9.1/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
+}