diff --git a/bitnami/postgresql/15/debian-11/Dockerfile b/bitnami/postgresql/15/debian-11/Dockerfile
index d57d09241ada..f583d9d7f8ff 100644
--- a/bitnami/postgresql/15/debian-11/Dockerfile
+++ b/bitnami/postgresql/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-03-22T10:33:47Z" \
+      org.opencontainers.image.created="2023-03-27T14:37:24Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="15.2.0-debian-11-r14" \
+      org.opencontainers.image.ref.name="15.2.0-debian-11-r15" \
       org.opencontainers.image.title="postgresql" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="15.2.0"
diff --git a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 1f3ae11a0dbc..56f574fb70f4 100644
--- a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,14 +1,12 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "1.16.0-3"
     },
     "postgresql": {
         "arch": "amd64",
-        "digest": "310e6ccc10a3ab50df249bec34b3b6e36cf7ada74b6607fb4a152bd75aaf6ac9",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "15.2.0-6"
diff --git a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 2d4b7af6fd3a..6fcb304d34cc 100644
--- a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -395,7 +395,7 @@ PartOf=bitnami.service
 Type=${type}
 EOF
     if [[ -n "$working_directory" ]]; then
-        cat >> "$service_file" <<< "WorkingDirectory=$working_directory"
+        cat >> "$service_file" <<< "WorkingDirectory=${working_directory}"
     fi
     if [[ -n "$exec_start_pre" ]]; then
         # This variable may contain multiple ExecStartPre= directives
diff --git a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 818c2158032b..5860791219cf 100644
--- a/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/postgresql/15/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -112,7 +112,11 @@ is_web_server_running() {
 #########################
 web_server_start() {
     info "Starting $(web_server_type) in background"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl start "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################
@@ -126,7 +130,11 @@ web_server_start() {
 #########################
 web_server_stop() {
     info "Stopping $(web_server_type)"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl stop "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################
@@ -140,7 +148,11 @@ web_server_stop() {
 #########################
 web_server_restart() {
     info "Restarting $(web_server_type)"
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl restart "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################
@@ -153,7 +165,11 @@ web_server_restart() {
 #   None
 #########################
 web_server_reload() {
-    "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
+    if [[ "$BITNAMI_SERVICE_MANAGER" = "monit" ]]; then
+        "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh"
+    elif [[ "$BITNAMI_SERVICE_MANAGER" = "systemd" ]]; then
+        systemctl reload "bitnami.$(web_server_type).service"
+    fi
 }
 
 ########################