diff --git a/bitnami/moodle/4.0/debian-11/Dockerfile b/bitnami/moodle/4.0/debian-11/Dockerfile
index 2d447389ebfa..ca42db6969b4 100644
--- a/bitnami/moodle/4.0/debian-11/Dockerfile
+++ b/bitnami/moodle/4.0/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-21T23:47:31Z" \
+      org.opencontainers.image.created="2023-03-28T05:08:09Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.0.7-debian-11-r3" \
+      org.opencontainers.image.ref.name="4.0.7-debian-11-r4" \
       org.opencontainers.image.title="moodle" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.0.7"
diff --git a/bitnami/moodle/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/moodle/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 531f077d70f4..1ff85d0256f6 100644
--- a/bitnami/moodle/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/moodle/4.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,56 +1,48 @@
 {
     "apache": {
         "arch": "amd64",
-        "digest": "d5cad8cbc55051131d136e9cdaa6f9802b24641302c8b02d823389c32b4daf30",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "2.4.56-1"
     },
     "gosu": {
         "arch": "amd64",
-        "digest": "bf2b90a31df691e3648c4a41190a926bb638c3a9fa1dfcde36623ce1bfaadc23",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "1.16.0-3"
     },
     "libphp": {
         "arch": "amd64",
-        "digest": "27a2516f8d36b23aa874188f9b3708e5cd06a9bf2bb470383b96f6316d23d45a",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "8.0.28-4"
     },
     "moodle": {
         "arch": "amd64",
-        "digest": "4e0cec046bf1e65895411901f3abdeec4a77f54ad1681717ef448f25b7231c81",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "4.0.7-1"
     },
     "mysql-client": {
         "arch": "amd64",
-        "digest": "6ed7c73b5e779521cf2f47a00ac54e6d2929213cb4eb3cbd9a4f12f84557c664",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "10.6.12-2"
     },
     "php": {
         "arch": "amd64",
-        "digest": "b50514c8ff1b37c79f67b381d487756ba0211068b457813cf99fb95048f9463d",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "8.0.28-5"
     },
     "postgresql-client": {
         "arch": "amd64",
-        "digest": "8fe91f9d7614cfa0005f9bb38c0893a7c94e67bfaca421862500c23c68c52ac9",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "13.10.0-2"
     },
     "render-template": {
         "arch": "amd64",
-        "digest": "d1a128e25098f793a92342efd5fa85c1075a2b21042929b269d23c6694e20c3b",
         "distro": "debian-11",
         "type": "NAMI",
         "version": "1.0.5-2"
diff --git a/bitnami/moodle/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/moodle/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 2d4b7af6fd3a..6fcb304d34cc 100644
--- a/bitnami/moodle/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/moodle/4.0/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/moodle/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/moodle/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 818c2158032b..5860791219cf 100644
--- a/bitnami/moodle/4.0/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/moodle/4.0/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
 }
 
 ########################