diff --git a/bitnami/pgbouncer/1/debian-12/Dockerfile b/bitnami/pgbouncer/1/debian-12/Dockerfile
index 41e62759dd01..8892c9ef4603 100644
--- a/bitnami/pgbouncer/1/debian-12/Dockerfile
+++ b/bitnami/pgbouncer/1/debian-12/Dockerfile
@@ -8,10 +8,9 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-05-30T15:39:07Z" \
+      org.opencontainers.image.created="2025-06-26T06:29:50Z" \
       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.ref.name="1.24.1-debian-12-r3" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/pgbouncer" \
       org.opencontainers.image.title="pgbouncer" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -26,11 +25,13 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl libaudit1 libbsd0 libc-ares2 libcap-ng0 libedit2 libevent-2.1-7 libffi8 libgcc-s1 libgmp10 libgnutls30 libhogweed6 libicu72 libidn2-0 libldap-2.5-0 liblzma5 libmd0 libnettle8 libp11-kit0 libpam0g libsasl2-2 libssl3 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 locales procps zlib1g
-RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
+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.8-16-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.9-0-linux-${OS_ARCH}-debian-12" \
       "postgresql-client-14.18.0-0-linux-${OS_ARCH}-debian-12" \
-      "ini-file-1.4.7-16-linux-${OS_ARCH}-debian-12" \
+      "ini-file-1.4.8-0-linux-${OS_ARCH}-debian-12" \
       "pgbouncer-1.24.1-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
@@ -49,6 +50,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
     DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales && \
     echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
+RUN uninstall_packages curl
 
 COPY rootfs /
 RUN update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index da5dcf8e92a3..e21f97af8246 100644
--- a/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/pgbouncer/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.4.7-16"
+        "version": "1.4.8-0"
     },
     "pgbouncer": {
         "arch": "amd64",
@@ -21,6 +21,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.8-16"
+        "version": "1.0.9-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/pgbouncer/1/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/pgbouncer/1/debian-12/prebuildfs/usr/sbin/uninstall_packages
new file mode 100755
index 000000000000..615c430e4e68
--- /dev/null
+++ b/bitnami/pgbouncer/1/debian-12/prebuildfs/usr/sbin/uninstall_packages
@@ -0,0 +1,26 @@
+#!/bin/sh
+# Copyright Broadcom, Inc. All Rights Reserved.
+# SPDX-License-Identifier: APACHE-2.0
+set -eu
+
+n=0
+max=2
+export DEBIAN_FRONTEND=noninteractive
+
+until [ $n -gt $max ]; do
+    set +e
+    (
+        apt-get autoremove --purge -y "$@"
+    )
+    CODE=$?
+    set -e
+    if [ $CODE -eq 0 ]; then
+        break
+    fi
+    if [ $n -eq $max ]; then
+        exit $CODE
+    fi
+    echo "apt failed, retrying"
+    n=$(($n + 1))
+done
+apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/pgbouncer/1/debian-12/tags-info.yaml b/bitnami/pgbouncer/1/debian-12/tags-info.yaml
index 6c454b86d5a2..179f94f98156 100644
--- a/bitnami/pgbouncer/1/debian-12/tags-info.yaml
+++ b/bitnami/pgbouncer/1/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
-- "1"
-- 1-debian-12
-- 1.24.1
-- latest
+  - "1"
+  - 1-debian-12
+  - 1.24.1
+  - latest
diff --git a/bitnami/pgbouncer/README.md b/bitnami/pgbouncer/README.md
index 9930165b7122..ed81141eaa0f 100644
--- a/bitnami/pgbouncer/README.md
+++ b/bitnami/pgbouncer/README.md
@@ -292,9 +292,9 @@ version: '2'
 
 services:
   pgbouncer:
-    image: 'bitnami/pgbouncer:latest'
+    image: bitnami/pgbouncer:latest
     ports:
-      - '6432:6432'
+      - 6432:6432
     volumes:
       - /path/to/pgbouncer-persistence/conf/:/bitnami/pgbouncer/conf/
 ```
@@ -331,35 +331,35 @@ The PgBouncer initialization process requires one PostgreSQL backend to be confi
 
 ```yaml
   pg1:
-    image: docker.io/bitnami/postgresql:14
+    image: docker.io/bitnami/postgresql:latest
     volumes:
-      - 'pg1_data:/bitnami/postgresql'
+      - pg1_data:/bitnami/postgresql
     environment:
       - POSTGRESQL_PASSWORD=password1
       - POSTGRESQL_DATABASE=db1
 
   pg2:
-    image: docker.io/bitnami/postgresql:15
+    image: docker.io/bitnami/postgresql:latest
     volumes:
-      - 'pg2_data:/bitnami/postgresql'
+      - pg2_data:/bitnami/postgresql
     environment:
       - POSTGRESQL_PASSWORD=password2
       - POSTGRESQL_DATABASE=db2
 
   pg3:
-    image: docker.io/bitnami/postgresql:14
+    image: docker.io/bitnami/postgresql:latest
     volumes:
-      - 'pg3_data:/bitnami/postgresql'
+      - pg3_data:/bitnami/postgresql
     environment:
       - POSTGRESQL_PASSWORD=password3
       - POSTGRESQL_DATABASE=db3
 
   pgbouncer:
-    image: docker.io/bitnami/pgbouncer:1
+    image: docker.io/bitnami/pgbouncer:latest
     ports:
       - 6432:6432
     volumes:
-      - './userlists.txt:/bitnami/userlists.txt'
+      - ./userlists.txt:/bitnami/userlists.txt
     environment:
       - POSTGRESQL_HOST=pg1
       - POSTGRESQL_PASSWORD=password1