diff --git a/bitnami/pgbouncer/1/debian-12/Dockerfile b/bitnami/pgbouncer/1/debian-12/Dockerfile
index e12ec8b4f77b..44481f5b629a 100644
--- a/bitnami/pgbouncer/1/debian-12/Dockerfile
+++ b/bitnami/pgbouncer/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-11T03:58:39Z" \
+      org.opencontainers.image.created="2026-07-10T11:01:40Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/pgbouncer/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/pgbouncer" \
@@ -29,10 +29,10 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
       "nss-wrapper-1.1.16-0-linux-${OS_ARCH}-debian-12" \
-      "wait-for-port-1.0.10-11-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.10-14-linux-${OS_ARCH}-debian-12" \
       "postgresql-client-14.23.0-0-linux-${OS_ARCH}-debian-12" \
-      "ini-file-1.4.9-12-linux-${OS_ARCH}-debian-12" \
-      "pgbouncer-1.25.2-0-linux-${OS_ARCH}-debian-12" \
+      "ini-file-1.4.9-13-linux-${OS_ARCH}-debian-12" \
+      "pgbouncer-1.25.2-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -57,7 +57,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/pgbouncer/postunpack.sh
 ENV APP_VERSION="1.25.2" \
     BITNAMI_APP_NAME="pgbouncer" \
-    IMAGE_REVISION="5" \
+    IMAGE_REVISION="6" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib" \
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index d07b04443b5d..000000000000
--- a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-aba4a9b96e5a3b29743fe09c4b3279c789bace4171fe34574d166668dfc59523  ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index b5397259b807..000000000000
--- a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-262a2d83e7294bb3adf0664ece04686f162a6355713981c7677634f2645505f0  ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..008faba52f43
--- /dev/null
+++ b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+16c20658d1341bd5b925060c770e5007f8df19ce79bf73b3fedc5653c9b73a08  ini-file-1.4.9-13-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..6c8c65eeeef7
--- /dev/null
+++ b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+07d509365514e811d0cd3727d33add8dcc9de3382e3220f7b839d617846e5e9e  ini-file-1.4.9-13-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-0-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 14a09edbef60..000000000000
--- a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-0-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-c23d7248d89f7d96810e8f290c1dd9edb63dbb7cffcc72ef4854a97630d5eefe  pgbouncer-1.25.2-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-0-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 25d172145ddc..000000000000
--- a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-0-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-ccd2e0aec6505d73d73e5dc8658a9e21154020e354fd5a41b9e9eecee7d758dd  pgbouncer-1.25.2-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-1-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..f2a6b4333612
--- /dev/null
+++ b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-1-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+cc01e6baddc5f7502430cdb8f679c5ef1f8d5763bf1dee032f00a63b70f1233e  pgbouncer-1.25.2-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-1-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..978c1cc4f8b6
--- /dev/null
+++ b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/pgbouncer-1.25.2-1-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+73e9487dadb9dece2cbc088a7a4983771394255b07463c25422c5024a8b2138c  pgbouncer-1.25.2-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/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/pgbouncer/1/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/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-11-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/1/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/pgbouncer/1/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/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/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/pgbouncer/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/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/checksums/wait-for-port-1.0.10-14-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/pgbouncer/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/pgbouncer/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/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index 18445e7d27fa..833ee5ab1d65 100644
--- a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -39,7 +39,7 @@ persist_app() {
     fi
     pushd "$install_dir" >/dev/null || exit
     local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder
-    local -r tmp_file="/tmp/perms.acl"
+    local -r acl_file="$(mktemp "${TMPDIR:-/tmp}"/acl.XXXXXXXXXX)"
     for file_to_persist in "${files_to_persist[@]}"; do
         if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then
             error "Cannot persist '${file_to_persist}' because it does not exist"
@@ -50,22 +50,22 @@ persist_app() {
         file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")"
         # Get original permissions for existing files, which will be applied later
         # Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume
-        getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file"
+        getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$acl_file"
         # Copy directories to the volume
         ensure_dir_exists "$file_to_persist_destination_folder"
         cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder"
         # Restore permissions
         pushd "$persist_dir" >/dev/null || exit
         if am_i_root; then
-            setfacl --restore="$tmp_file"
+            setfacl --restore="$acl_file"
         else
             # When running as non-root, don't change ownership
-            setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file")
+            setfacl --restore=<(grep -E -v '^# (owner|group):' "$acl_file")
         fi
         popd >/dev/null || exit
     done
     popd >/dev/null || exit
-    rm -f "$tmp_file"
+    rm -f "$acl_file"
     # Install the persisted files into the installation directory, via symlinks
     restore_persisted_app "$@"
 }
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index a8293800d55c..c1d60a5c5f42 100644
--- a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/pgbouncer/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
+}