diff --git a/bitnami/supabase-postgres/15/debian-11/Dockerfile b/bitnami/supabase-postgres/15/debian-11/Dockerfile
index 9115dbaa5abd..90a5d5838629 100644
--- a/bitnami/supabase-postgres/15/debian-11/Dockerfile
+++ b/bitnami/supabase-postgres/15/debian-11/Dockerfile
@@ -7,7 +7,7 @@ ARG WITH_ALL_LOCALES="no"
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="15.1.0-debian-11-r3" \
+      org.opencontainers.image.ref.name="15.1.0-debian-11-r4" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/supabase-postgres" \
       org.opencontainers.image.title="supabase-postgres" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/supabase-postgres/15/debian-11/rootfs/opt/bitnami/scripts/supabase-postgres/migrate.sh b/bitnami/supabase-postgres/15/debian-11/rootfs/opt/bitnami/scripts/supabase-postgres/migrate.sh
index d202df369850..8240bcdc0c89 100755
--- a/bitnami/supabase-postgres/15/debian-11/rootfs/opt/bitnami/scripts/supabase-postgres/migrate.sh
+++ b/bitnami/supabase-postgres/15/debian-11/rootfs/opt/bitnami/scripts/supabase-postgres/migrate.sh
@@ -14,7 +14,11 @@ set -eu
 export PGDATABASE="${POSTGRES_DB:-postgres}"
 export PGHOST="${POSTGRES_HOST:-localhost}"
 export PGPORT="${POSTGRESQL_PORT_NUMBER:-5432}"
-export PGPASSWORD="${POSTGRESQL_PASSWORD:-}"
+if [[ "$POSTGRESQL_USERNAME" = "postgres" ]]; then
+    export PGPASSWORD="${POSTGRESQL_PASSWORD:-}"
+else
+    export PGPASSWORD="${POSTGRES_POSTGRES_PASSWORD:-}"
+fi
 
 for sql in /opt/bitnami/supabase-postgres/migrations/*.sql; do
     echo "$0: running $sql"