diff --git a/compose/.env-with-keycloak-template b/compose/.env-with-keycloak-template
index 9662e99..b609fb9 100644
--- a/compose/.env-with-keycloak-template
+++ b/compose/.env-with-keycloak-template
@@ -55,8 +55,8 @@ SSL_KEYCLOAK_KEY=ssl-keycloak.key
 KEYCLOAK_DB_USERNAME=keycloak
 KEYCLOAK_DB_PASSWORD=keycloak
 
-KEYCLOAK_ADMIN_PASSWORD=keycloak
-KEYCLOAK_ADMIN=admin
+KC_BOOTSTRAP_ADMIN_PASSWORD=keycloak
+KC_BOOTSTRAP_ADMIN_USERNAME=admin
 
 # Uncomment the following lines to enable AI integration with Ollama
 #CT_HQ_OLLAMA_AI_URL=http://codetogether-llm:8000
diff --git a/compose/keycloak/.env-template b/compose/keycloak/.env-template
index 5127bae..d74827d 100644
--- a/compose/keycloak/.env-template
+++ b/compose/keycloak/.env-template
@@ -5,5 +5,5 @@ SSL_KEYCLOAK_KEY=ssl-keycloak.key
 KEYCLOAK_DB_USERNAME=keycloak
 KEYCLOAK_DB_PASSWORD=keycloak
 
-KEYCLOAK_ADMIN_PASSWORD=keycloak
-KEYCLOAK_ADMIN=admin
\ No newline at end of file
+KC_BOOTSTRAP_ADMIN_PASSWORD=keycloak
+KC_BOOTSTRAP_ADMIN_USERNAME=admin
\ No newline at end of file
diff --git a/compose/keycloak/compose-keycloak-no-nginx.yaml b/compose/keycloak/compose-keycloak-no-nginx.yaml
index aee976e..8af2fd9 100644
--- a/compose/keycloak/compose-keycloak-no-nginx.yaml
+++ b/compose/keycloak/compose-keycloak-no-nginx.yaml
@@ -36,8 +36,8 @@ services:
       - "start"
     environment:
       # Admin credentials
-      KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN}
-      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
+      KC_BOOTSTRAP_ADMIN_USERNAME: ${KC_BOOTSTRAP_ADMIN_USERNAME}
+      KC_BOOTSTRAP_ADMIN_PASSWORD: ${KC_BOOTSTRAP_ADMIN_PASSWORD}
 
       # Database connectivity
       KC_DB: mysql
diff --git a/compose/keycloak/compose-keycloak.yaml b/compose/keycloak/compose-keycloak.yaml
index ba83c4b..d1d5233 100644
--- a/compose/keycloak/compose-keycloak.yaml
+++ b/compose/keycloak/compose-keycloak.yaml
@@ -55,8 +55,8 @@ services:
       - "start"
     environment:
       # Admin credentials
-      KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN}
-      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD}
+      KC_BOOTSTRAP_ADMIN_USERNAME: ${KC_BOOTSTRAP_ADMIN_USERNAME}
+      KC_BOOTSTRAP_ADMIN_PASSWORD: ${KC_BOOTSTRAP_ADMIN_PASSWORD}
 
       # Database connectivity
       KC_DB: mysql