diff --git a/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/libpgbouncer.sh b/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/libpgbouncer.sh
index f903a94e21ee..e65efe6c455b 100644
--- a/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/libpgbouncer.sh
+++ b/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/libpgbouncer.sh
@@ -204,6 +204,9 @@ pgbouncer_initialize() {
         if is_boolean_yes "$PGBOUNCER_SET_DATABASE_USER"; then
             database_value+=" user=$POSTGRESQL_USERNAME"
         fi
+        if is_boolean_yes "$PGBOUNCER_SET_DATABASE_PASSWORD"; then
+            database_value+=" password=$POSTGRESQL_PASSWORD"
+        fi
         if [[ "$PGBOUNCER_DATABASE" != "*" ]]; then
             database_value+=" dbname=$POSTGRESQL_DATABASE"
         fi
diff --git a/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh b/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
index 6c2d32505d63..5ef881498c40 100644
--- a/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
+++ b/bitnami/pgbouncer/1/debian-10/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
@@ -60,6 +60,7 @@ pgbouncer_env_vars=(
     POSTGRESQL_HOST
     POSTGRESQL_PORT
     PGBOUNCER_SET_DATABASE_USER
+    PGBOUNCER_SET_DATABASE_PASSWORD
     PGBOUNCER_FORCE_INITSCRIPTS
     PGBOUNCER_DAEMON_USER
     PGBOUNCER_DAEMON_GROUP
@@ -135,6 +136,7 @@ export POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-postgres}"
 export POSTGRESQL_HOST="${POSTGRESQL_HOST:-postgresql}"
 export POSTGRESQL_PORT="${POSTGRESQL_PORT:-5432}"
 export PGBOUNCER_SET_DATABASE_USER="${PGBOUNCER_SET_DATABASE_USER:-no}"
+export PGBOUNCER_SET_DATABASE_PASSWORD="${PGBOUNCER_SET_DATABASE_PASSWORD:-no}"
 export PGBOUNCER_FORCE_INITSCRIPTS="${PGBOUNCER_FORCE_INITSCRIPTS:-false}"
 
 # System settings