diff --git a/bitnami/pgbouncer/1/debian-11/Dockerfile b/bitnami/pgbouncer/1/debian-11/Dockerfile
index 3af4523d6e45..e37f3a692e18 100644
--- a/bitnami/pgbouncer/1/debian-11/Dockerfile
+++ b/bitnami/pgbouncer/1/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-09-17T18:31:04Z" \
+      org.opencontainers.image.created="2023-09-20T10:09:11Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.20.1-debian-11-r36" \
+      org.opencontainers.image.ref.name="1.20.1-debian-11-r39" \
       org.opencontainers.image.title="pgbouncer" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.20.1"
diff --git a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh
index c2bff4e57c45..027986c84361 100644
--- a/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh
+++ b/bitnami/pgbouncer/1/debian-11/rootfs/opt/bitnami/scripts/libpgbouncer.sh
@@ -203,7 +203,8 @@ pgbouncer_initialize() {
     info "Configuring credentials"
     # Create credentials file
     if ! pgbouncer_is_file_external "userlist.txt"; then
-        echo "pgbouncer_escape_auth $POSTGRESQL_USERNAME" "pgbouncer_escape_auth $POSTGRESQL_PASSWORD" > "$PGBOUNCER_AUTH_FILE"
+        echo "\"$(pgbouncer_escape_auth "$POSTGRESQL_USERNAME")\" \"$(pgbouncer_escape_auth "$POSTGRESQL_PASSWORD")\"" \
+           > "$PGBOUNCER_AUTH_FILE"
         echo "$PGBOUNCER_USERLIST" >> "$PGBOUNCER_AUTH_FILE"
     else
         debug "User list file mounted externally, skipping configuration"