diff --git a/bitnami/zookeeper/3.9/debian-12/Dockerfile b/bitnami/zookeeper/3.9/debian-12/Dockerfile
index 33d782e19e0e..745b8ac56545 100644
--- a/bitnami/zookeeper/3.9/debian-12/Dockerfile
+++ b/bitnami/zookeeper/3.9/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-11T08:42:19Z" \
+      org.opencontainers.image.created="2026-07-09T08:35:45Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/zookeeper/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/zookeeper" \
@@ -29,7 +29,7 @@ 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-11-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.10-14-linux-${OS_ARCH}-debian-12" \
       "jre-11.0.31-11-1-linux-${OS_ARCH}-debian-12" \
       "zookeeper-3.9.5-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
@@ -53,7 +53,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/zookeeper/postunpack.sh
 ENV APP_VERSION="3.9.5" \
     BITNAMI_APP_NAME="zookeeper" \
-    IMAGE_REVISION="10"
+    IMAGE_REVISION="11"
 
 EXPOSE 2181 2888 3888 8080
 
diff --git a/bitnami/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index ab86dab7c5d1..000000000000
--- a/bitnami/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-b8a9cd842e95ae16de5bbf157cc7e246c79a24d3b5b626bcce32f6904a895383  wait-for-port-1.0.10-11-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 3799475af672..000000000000
--- a/bitnami/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-ae2e822f8c673eb66a2cadbc6dc5fe9c8c0791564751e453a04a416ab9bd6f61  wait-for-port-1.0.10-11-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/zookeeper/3.9/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/zookeeper/3.9/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/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/zookeeper/3.9/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/zookeeper/3.9/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/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index a8293800d55c..c1d60a5c5f42 100644
--- a/bitnami/zookeeper/3.9/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/zookeeper/3.9/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
+}
diff --git a/bitnami/zookeeper/3.9/debian-12/rootfs/opt/bitnami/scripts/libzookeeper.sh b/bitnami/zookeeper/3.9/debian-12/rootfs/opt/bitnami/scripts/libzookeeper.sh
index e29907ca6be1..07dc3ebea013 100644
--- a/bitnami/zookeeper/3.9/debian-12/rootfs/opt/bitnami/scripts/libzookeeper.sh
+++ b/bitnami/zookeeper/3.9/debian-12/rootfs/opt/bitnami/scripts/libzookeeper.sh
@@ -196,7 +196,8 @@ zookeeper_initialize() {
 #########################
 zookeeper_generate_conf() {
     cp "${ZOO_CONF_DIR}/zoo_sample.cfg" "$ZOO_CONF_FILE"
-    chmod 600 "$ZOO_CONF_FILE"
+    chmod 640 "$ZOO_CONF_FILE"
+    am_i_root && chown ":$ZOO_DAEMON_GROUP" "$ZOO_CONF_FILE"
     echo >>"$ZOO_CONF_FILE"
 
     zookeeper_conf_set "$ZOO_CONF_FILE" tickTime "$ZOO_TICK_TIME"
@@ -332,8 +333,8 @@ zookeeper_enable_client_server_authentication() {
     info "Enabling authentication..."
     zookeeper_conf_set "$filename" authProvider.1 org.apache.zookeeper.server.auth.SASLAuthenticationProvider
     zookeeper_conf_set "$filename" sessionRequireClientSASLAuth true
-    zookeeper_conf_set enforce.auth.enabled true
-    zookeeper_conf_set enforce.auth.schemes sasl
+    zookeeper_conf_set "$filename" enforce.auth.enabled true
+    zookeeper_conf_set "$filename" enforce.auth.schemes sasl
 }
 
 ########################