diff --git a/bitnami/keycloak/20/debian-11/Dockerfile b/bitnami/keycloak/20/debian-11/Dockerfile
index ee5075692388..ebf20d4ba4ed 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-04T10:48:10Z" \
+      org.opencontainers.image.created="2023-03-07T11:26:27Z" \
       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-r5" \
+      org.opencontainers.image.ref.name="20.0.5-debian-11-r6" \
       org.opencontainers.image.title="keycloak" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="20.0.5"
diff --git a/bitnami/keycloak/20/debian-11/rootfs/opt/bitnami/scripts/keycloak-env.sh b/bitnami/keycloak/20/debian-11/rootfs/opt/bitnami/scripts/keycloak-env.sh
index c1ababe0b27c..f09e1c060b60 100644
--- a/bitnami/keycloak/20/debian-11/rootfs/opt/bitnami/scripts/keycloak-env.sh
+++ b/bitnami/keycloak/20/debian-11/rootfs/opt/bitnami/scripts/keycloak-env.sh
@@ -52,6 +52,7 @@ keycloak_env_vars=(
     KEYCLOAK_PROXY
     KEYCLOAK_PRODUCTION
     KEYCLOAK_EXTRA_ARGS_PREPENDED
+    KEYCLOAK_DATABASE_VENDOR
     KEYCLOAK_DATABASE_HOST
     KEYCLOAK_DATABASE_PORT
     KEYCLOAK_DATABASE_USER
diff --git a/bitnami/keycloak/20/debian-11/rootfs/opt/bitnami/scripts/libkeycloak.sh b/bitnami/keycloak/20/debian-11/rootfs/opt/bitnami/scripts/libkeycloak.sh
index 1e0e4cbf9c94..a537f06a2ee9 100644
--- a/bitnami/keycloak/20/debian-11/rootfs/opt/bitnami/scripts/libkeycloak.sh
+++ b/bitnami/keycloak/20/debian-11/rootfs/opt/bitnami/scripts/libkeycloak.sh
@@ -132,7 +132,7 @@ keycloak_configure_database() {
     jdbc_params="$(echo "$KEYCLOAK_JDBC_PARAMS" | sed -E '/^$|^\&.+$/!s/^/\&/;s/\&/\\&/g')"
 
     info "Configuring database settings"
-    if [[ "KEYCLOAK_DATABASE_VENDOR" == "postgresql" ]]; then
+    if [[ "${KEYCLOAK_DATABASE_VENDOR}" == "postgresql" ]]; then
         keycloak_conf_set "db" "postgres"
         keycloak_conf_set "db-username" "$KEYCLOAK_DATABASE_USER"
         keycloak_conf_set "db-password" "$KEYCLOAK_DATABASE_PASSWORD"
@@ -280,19 +280,19 @@ keycloak_configure_spi_tls() {
 #########################
 keycloak_initialize() {
     # Clean to avoid issues when running docker restart
-    if [[ "KEYCLOAK_DATABASE_VENDOR" == "postgresql" ]]; then
-      # Wait for database
-      info "Trying to connect to PostgreSQL server $KEYCLOAK_DATABASE_HOST..."
-      if ! retry_while "wait-for-port --host $KEYCLOAK_DATABASE_HOST --timeout 10 $KEYCLOAK_DATABASE_PORT" "$KEYCLOAK_INIT_MAX_RETRIES"; then
-          error "Unable to connect to host $KEYCLOAK_DATABASE_HOST"
-          exit 1
-      else
-          info "Found PostgreSQL server listening at $KEYCLOAK_DATABASE_HOST:$KEYCLOAK_DATABASE_PORT"
-      fi
+    if [[ "${KEYCLOAK_DATABASE_VENDOR}" == "postgresql" ]]; then
+        # Wait for database
+        info "Trying to connect to PostgreSQL server $KEYCLOAK_DATABASE_HOST..."
+        if ! retry_while "wait-for-port --host $KEYCLOAK_DATABASE_HOST --timeout 10 $KEYCLOAK_DATABASE_PORT" "$KEYCLOAK_INIT_MAX_RETRIES"; then
+            error "Unable to connect to host $KEYCLOAK_DATABASE_HOST"
+            exit 1
+        else
+            info "Found PostgreSQL server listening at $KEYCLOAK_DATABASE_HOST:$KEYCLOAK_DATABASE_PORT"
+        fi
 
-      if ! is_dir_empty "$KEYCLOAK_MOUNTED_CONF_DIR"; then
-          cp -Lr "$KEYCLOAK_MOUNTED_CONF_DIR"/* "$KEYCLOAK_CONF_DIR"
-      fi
+        if ! is_dir_empty "$KEYCLOAK_MOUNTED_CONF_DIR"; then
+            cp -Lr "$KEYCLOAK_MOUNTED_CONF_DIR"/* "$KEYCLOAK_CONF_DIR"
+        fi
     fi
     keycloak_configure_database
     keycloak_configure_metrics