diff --git a/kubernetes/loculus/templates/keycloak-deployment.yaml b/kubernetes/loculus/templates/keycloak-deployment.yaml
index 1ffaeaee3..eb0fda733 100644
--- a/kubernetes/loculus/templates/keycloak-deployment.yaml
+++ b/kubernetes/loculus/templates/keycloak-deployment.yaml
@@ -71,9 +71,16 @@ spec:
                 secretKeyRef:
                   name: keycloak-database
                   key: password
-            - name: KC_BOOTSTRAP_ADMIN_USERNAME
+            - name: KC_BOOTSTRAP_ADMIN_USERNAME # TODO: delete after upgrading keycloak (#3736 )
               value: "admin"
-            - name: KC_BOOTSTRAP_ADMIN_PASSWORD
+            - name: KC_BOOTSTRAP_ADMIN_PASSWORD # TODO: delete after upgrading keycloak (#3736 )
+              valueFrom:
+                secretKeyRef:
+                  name: keycloak-admin
+                  key: initialAdminPassword
+            - name: KEYCLOAK_ADMIN
+              value: "admin"
+            - name: KEYCLOAK_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: keycloak-admin