diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
index b6c90f0858a5..3d1cbff20083 100644
--- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
+++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/pgbouncer-env.sh
@@ -168,7 +168,7 @@ export PGBOUNCER_CLIENT_IDLE_TIMEOUT="${PGBOUNCER_CLIENT_IDLE_TIMEOUT:-}"
 # PostgreSQL backend settings
 export POSTGRESQL_USERNAME="${POSTGRESQL_USERNAME:-postgres}"
 export POSTGRESQL_PASSWORD="${POSTGRESQL_PASSWORD:-}"
-export POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-postgres}"
+export POSTGRESQL_DATABASE="${POSTGRESQL_DATABASE:-${PGBOUNCER_DATABASE}}"
 export POSTGRESQL_HOST="${POSTGRESQL_HOST:-postgresql}"
 export POSTGRESQL_PORT="${POSTGRESQL_PORT:-5432}"
 export PGBOUNCER_SET_DATABASE_USER="${PGBOUNCER_SET_DATABASE_USER:-no}"