diff --git a/bitnami/keycloak/20/debian-11/Dockerfile b/bitnami/keycloak/20/debian-11/Dockerfile
index b6151e3e5dc8..51375f6e3f9d 100644
--- a/bitnami/keycloak/20/debian-11/Dockerfile
+++ b/bitnami/keycloak/20/debian-11/Dockerfile
@@ -4,10 +4,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-03-22T04:38:12Z" \
+      org.opencontainers.image.created="2023-03-24T11:17:48Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="20.0.5-debian-11-r9" \
+      org.opencontainers.image.ref.name="20.0.5-debian-11-r10" \
       org.opencontainers.image.title="keycloak" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="20.0.5"
@@ -25,7 +25,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
       "wait-for-port-1.0.6-2-linux-${OS_ARCH}-debian-11" \
       "java-17.0.6-10-3-linux-${OS_ARCH}-debian-11" \
-      "keycloak-20.0.5-3-linux-${OS_ARCH}-debian-11" \
+      "keycloak-20.0.5-4-linux-${OS_ARCH}-debian-11" \
       "gosu-1.16.0-3-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 9a38624f52de..216a1e8e1519 100644
--- a/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,10 +15,10 @@
     },
     "keycloak": {
         "arch": "amd64",
-        "digest": "f7b39a08c93b97300c31945eda0d168f3b443a37c8b0d0d13dbac6314f99938f",
+        "digest": "7d2eef18c5ae16c0231cba02e93fe5b8fc7abafceda0e3e243c1c144c76725ff",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "20.0.5-3"
+        "version": "20.0.5-4"
     },
     "wait-for-port": {
         "arch": "amd64",
diff --git a/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index 2d4b7af6fd3a..6fcb304d34cc 100644
--- a/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/keycloak/20/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/keycloak/20/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 818c2158032b..5860791219cf 100644
--- a/bitnami/keycloak/20/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/keycloak/20/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
 }
 
 ########################