diff --git a/deployment/zitadel/secrets.yaml b/deployment/zitadel/secrets.yaml
index 2dda748..3faf188 100644
--- a/deployment/zitadel/secrets.yaml
+++ b/deployment/zitadel/secrets.yaml
@@ -8,6 +8,7 @@ metadata:
     secret-generator.cs.sap.com/enabled: "true"
 stringData: 
   masterkey: "%generate"
+  admin-password: "%generate"
 ---
 apiVersion: v1
 kind: Secret
@@ -19,4 +20,4 @@ metadata:
     secret-generator.cs.sap.com/enabled: "true"
 stringData:
   cockroach-password: "%generate"
-  user-password: "%generate"
\ No newline at end of file
+  user-password: "%generate"
diff --git a/deployment/zitadel/values.yaml b/deployment/zitadel/values.yaml
index 08b9052..a0060f4 100644
--- a/deployment/zitadel/values.yaml
+++ b/deployment/zitadel/values.yaml
@@ -25,6 +25,15 @@ annotations:
   argocd.argoproj.io/hook: Sync
 
 env:
+  - name: ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME
+    value: "admin"
+
+  - name: ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: zitadel-masterkey
+        key: admin-password
+
   - name: ZITADEL_DATABASE_COCKROACH_USER_PASSWORD
     valueFrom:
       secretKeyRef: