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 9effd78c2b67..8416f6f651ba 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
@@ -31,6 +31,7 @@ keycloak_env_vars=(
     KEYCLOAK_FRONTEND_URL
     KEYCLOAK_INIT_MAX_RETRIES
     KEYCLOAK_CACHE_TYPE
+    KEYCLOAK_CACHE_STACK
     KEYCLOAK_EXTRA_ARGS
     KEYCLOAK_ENABLE_STATISTICS
     KEYCLOAK_ENABLE_TLS
@@ -103,6 +104,7 @@ export KEYCLOAK_BIND_ADDRESS="${KEYCLOAK_BIND_ADDRESS:-$(hostname --fqdn)}"
 export KEYCLOAK_FRONTEND_URL="${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:-}"
 export KEYCLOAK_EXTRA_ARGS="${KEYCLOAK_EXTRA_ARGS:-}"
 export KEYCLOAK_ENABLE_STATISTICS="${KEYCLOAK_ENABLE_STATISTICS:-false}"
 export KEYCLOAK_ENABLE_TLS="${KEYCLOAK_ENABLE_TLS:-false}"
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 75b4c8d8fefb..feac2b536f97 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
@@ -133,6 +133,7 @@ keycloak_configure_database() {
 keycloak_configure_cache() {
     info "Configuring cache count"
     keycloak_conf_set "cache" "$KEYCLOAK_CACHE_TYPE"
+    ! is_empty_value "$KEYCLOAK_CACHE_STACK" && debug_execute kc.sh build --cache-stack="${KEYCLOAK_CACHE_STACK}"
 }
 
 ########################
diff --git a/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/keycloak-env.sh b/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/keycloak-env.sh
index 9effd78c2b67..8416f6f651ba 100644
--- a/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/keycloak-env.sh
+++ b/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/keycloak-env.sh
@@ -31,6 +31,7 @@ keycloak_env_vars=(
     KEYCLOAK_FRONTEND_URL
     KEYCLOAK_INIT_MAX_RETRIES
     KEYCLOAK_CACHE_TYPE
+    KEYCLOAK_CACHE_STACK
     KEYCLOAK_EXTRA_ARGS
     KEYCLOAK_ENABLE_STATISTICS
     KEYCLOAK_ENABLE_TLS
@@ -103,6 +104,7 @@ export KEYCLOAK_BIND_ADDRESS="${KEYCLOAK_BIND_ADDRESS:-$(hostname --fqdn)}"
 export KEYCLOAK_FRONTEND_URL="${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:-}"
 export KEYCLOAK_EXTRA_ARGS="${KEYCLOAK_EXTRA_ARGS:-}"
 export KEYCLOAK_ENABLE_STATISTICS="${KEYCLOAK_ENABLE_STATISTICS:-false}"
 export KEYCLOAK_ENABLE_TLS="${KEYCLOAK_ENABLE_TLS:-false}"
diff --git a/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/libkeycloak.sh b/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/libkeycloak.sh
index 75b4c8d8fefb..feac2b536f97 100644
--- a/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/libkeycloak.sh
+++ b/bitnami/keycloak/18/debian-10/rootfs/opt/bitnami/scripts/libkeycloak.sh
@@ -133,6 +133,7 @@ keycloak_configure_database() {
 keycloak_configure_cache() {
     info "Configuring cache count"
     keycloak_conf_set "cache" "$KEYCLOAK_CACHE_TYPE"
+    ! is_empty_value "$KEYCLOAK_CACHE_STACK" && debug_execute kc.sh build --cache-stack="${KEYCLOAK_CACHE_STACK}"
 }
 
 ########################