diff --git a/bitnami/supabase-postgres/15/debian-11/Dockerfile b/bitnami/supabase-postgres/15/debian-11/Dockerfile
index 6f1e6ca39b23..443f9edb0f1f 100644
--- a/bitnami/supabase-postgres/15/debian-11/Dockerfile
+++ b/bitnami/supabase-postgres/15/debian-11/Dockerfile
@@ -5,10 +5,10 @@ ARG TARGETARCH
 ARG WITH_ALL_LOCALES="no"
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-04-09T05:23:17Z" \
+      org.opencontainers.image.created="2023-04-12T05:42:52Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="15.1.0-debian-11-r24" \
+      org.opencontainers.image.ref.name="15.1.0-debian-11-r25" \
       org.opencontainers.image.title="supabase-postgres" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="15.1.0"
diff --git a/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 5860791219cf..94745ebe419e 100644
--- a/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/supabase-postgres/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -112,10 +112,10 @@ is_web_server_running() {
 #########################
 web_server_start() {
     info "Starting $(web_server_type) in background"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl start "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
     fi
 }
 
@@ -130,10 +130,10 @@ web_server_start() {
 #########################
 web_server_stop() {
     info "Stopping $(web_server_type)"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl stop "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
     fi
 }
 
@@ -148,10 +148,10 @@ web_server_stop() {
 #########################
 web_server_restart() {
     info "Restarting $(web_server_type)"
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl restart "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
     fi
 }
 
@@ -165,10 +165,10 @@ web_server_restart() {
 #   None
 #########################
 web_server_reload() {
-    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
-        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
-    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+    if [[ "${BITNAMI_SERVICE_MANAGER:-}" = "systemd" ]]; then
         systemctl reload "bitnami.$(web_server_type).service"
+    else
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
     fi
 }
 
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 8240bcdc0c89..8923e1d7ee89 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
@@ -11,13 +11,13 @@ set -eu
 ## https://github.com/supabase/postgres/blob/develop/migrations/db/migrate.sh
 ##
 
-export PGDATABASE="${POSTGRES_DB:-postgres}"
+export PGDATABASE="${POSTGRESQL_DB:-postgres}"
 export PGHOST="${POSTGRES_HOST:-localhost}"
 export PGPORT="${POSTGRESQL_PORT_NUMBER:-5432}"
 if [[ "$POSTGRESQL_USERNAME" = "postgres" ]]; then
     export PGPASSWORD="${POSTGRESQL_PASSWORD:-}"
 else
-    export PGPASSWORD="${POSTGRES_POSTGRES_PASSWORD:-}"
+    export PGPASSWORD="${POSTGRESQL_POSTGRES_PASSWORD:-}"
 fi
 
 for sql in /opt/bitnami/supabase-postgres/migrations/*.sql; do