diff --git a/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/keycloak-env.sh b/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/keycloak-env.sh
index 1aff06985895..4c6feef06816 100644
--- a/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/keycloak-env.sh
+++ b/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/keycloak-env.sh
@@ -29,6 +29,7 @@ keycloak_env_vars=(
     KEYCLOAK_HTTPS_PORT
     KEYCLOAK_BIND_ADDRESS
     KEYCLOAK_FRONTEND_URL
+    KC_HOSTNAME
     KEYCLOAK_INIT_MAX_RETRIES
     KEYCLOAK_CACHE_TYPE
     KEYCLOAK_CACHE_STACK
@@ -102,7 +103,7 @@ export KEYCLOAK_ADMIN_PASSWORD="${KEYCLOAK_ADMIN_PASSWORD:-bitnami}"
 export KEYCLOAK_HTTP_PORT="${KEYCLOAK_HTTP_PORT:-8080}"
 export KEYCLOAK_HTTPS_PORT="${KEYCLOAK_HTTPS_PORT:-8443}"
 export KEYCLOAK_BIND_ADDRESS="${KEYCLOAK_BIND_ADDRESS:-$(hostname --fqdn)}"
-export KEYCLOAK_FRONTEND_URL="${KEYCLOAK_FRONTEND_URL:-}"
+export KC_HOSTNAME="${KC_HOSTNAME:-"${KEYCLOAK_FRONTEND_URL:-}"}"
 export KEYCLOAK_INIT_MAX_RETRIES="${KEYCLOAK_INIT_MAX_RETRIES:-10}"
 export KEYCLOAK_CACHE_TYPE="${KEYCLOAK_CACHE_TYPE:-ispn}"
 export KEYCLOAK_CACHE_STACK="${KEYCLOAK_CACHE_STACK:-}"
diff --git a/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/libkeycloak.sh b/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/libkeycloak.sh
index 27edfc7cc48a..c120a44b76e7 100644
--- a/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/libkeycloak.sh
+++ b/bitnami/keycloak/17/debian-10/rootfs/opt/bitnami/scripts/libkeycloak.sh
@@ -304,4 +304,3 @@ keycloak_custom_init_scripts() {
         touch "$KEYCLOAK_VOLUME_DIR"/.user_scripts_initialized
     fi
 }
-