diff --git a/internal/start/start.go b/internal/start/start.go
index aba17b99f..3a5ab6bb1 100644
--- a/internal/start/start.go
+++ b/internal/start/start.go
@@ -770,10 +770,12 @@ EOF
 				Image: utils.PgbouncerImage,
 				Env: []string{
 					"POSTGRESQL_HOST=" + dbConfig.Host,
-					"POSTGRESQL_NAME=" + dbConfig.Database,
-					"POSTGRESQL_USER=" + dbConfig.User,
 					fmt.Sprintf("POSTGRESQL_PORT=%d", dbConfig.Port),
+					"POSTGRESQL_USERNAME=pgbouncer",
 					"POSTGRESQL_PASSWORD=" + dbConfig.Password,
+					"POSTGRESQL_DATABASE=" + dbConfig.Database,
+					"PGBOUNCER_AUTH_USER=pgbouncer",
+					"PGBOUNCER_AUTH_QUERY=SELECT * FROM pgbouncer.get_auth($1)",
 					fmt.Sprintf("PGBOUNCER_POOL_MODE=%s", utils.Config.Db.Pooler.PoolMode),
 					fmt.Sprintf("PGBOUNCER_DEFAULT_POOL_SIZE=%d", utils.Config.Db.Pooler.DefaultPoolSize),
 					fmt.Sprintf("PGBOUNCER_MAX_CLIENT_CONN=%d", utils.Config.Db.Pooler.MaxClientConn),
diff --git a/internal/utils/misc.go b/internal/utils/misc.go
index 1894c2e0b..278e115f2 100644
--- a/internal/utils/misc.go
+++ b/internal/utils/misc.go
@@ -35,7 +35,7 @@ const (
 	ImageProxyImage  = "darthsim/imgproxy:v3.8.0"
 	EdgeRuntimeImage = "supabase/edge-runtime:v1.18.1"
 	VectorImage      = "timberio/vector:0.28.1-alpine"
-	PgbouncerImage   = "bitnami/pgbouncer:1.20.1"
+	PgbouncerImage   = "bitnami/pgbouncer:1.20.1-debian-11-r39"
 	GotrueImage      = "supabase/gotrue:v2.92.1"
 	RealtimeImage    = "supabase/realtime:v2.10.1"
 	StorageImage     = "supabase/storage-api:v0.40.4"