diff --git a/keycloak/main.yaml b/keycloak/main.yaml
index 0dd2737..b6d02b1 100644
--- a/keycloak/main.yaml
+++ b/keycloak/main.yaml
@@ -156,9 +156,9 @@ spec:
           value: "true"
         - name: KC_HEALTH_ENABLED
           value: "true"
-        - name: KEYCLOAK_ADMIN
-          value: admin
-        - name: KEYCLOAK_ADMIN_PASSWORD
+        - name: KC_BOOTSTRAP_ADMIN_USERNAME
+          value: temp_admin
+        - name: KC_BOOTSTRAP_ADMIN_PASSWORD
           value: password
         envFrom: null
         image: quay.io/keycloak/keycloak:26.5.0
diff --git a/keycloak/src/values.yaml b/keycloak/src/values.yaml
index 085fa47..d23b371 100644
--- a/keycloak/src/values.yaml
+++ b/keycloak/src/values.yaml
@@ -116,9 +116,9 @@ args: []
 
 # Additional environment variables for Keycloak
 extraEnv: |
-  - name: KEYCLOAK_ADMIN
-    value: admin
-  - name: KEYCLOAK_ADMIN_PASSWORD
+  - name: KC_BOOTSTRAP_ADMIN_USERNAME
+    value: temp_admin
+  - name: KC_BOOTSTRAP_ADMIN_PASSWORD
     value: password
 # - name: KC_LOG_LEVEL
 #   value: DEBUG