diff --git a/apps/forge/forgejo-secrets/forgejo-variables.yaml b/apps/forge/forgejo-secrets/forgejo-variables.yaml
index c2c76d8..ad6d49e 100644
--- a/apps/forge/forgejo-secrets/forgejo-variables.yaml
+++ b/apps/forge/forgejo-secrets/forgejo-variables.yaml
@@ -6,5 +6,6 @@ metadata:
   namespace: flux-system
 spec:
   fields:
+  - fieldName: forgejo_admin_password
   - fieldName: postgresql_password
   - fieldName: postgresql_admin_password
diff --git a/apps/forge/forgejo/forgejo-values-configmap.yaml b/apps/forge/forgejo/forgejo-values-configmap.yaml
index d31ab75..5aac0dd 100644
--- a/apps/forge/forgejo/forgejo-values-configmap.yaml
+++ b/apps/forge/forgejo/forgejo-values-configmap.yaml
@@ -23,7 +23,7 @@ data:
       admin:
         username: "forgejo"
         email: "${admin_email}"
-        password: "${password}"
+        password: "${forgejo_admin_password}"
       # https://codeberg.org/forgejo-contrib/forgejo-helm#oauth2-settings
       oauth:
         - name: Stackspin
@@ -51,17 +51,41 @@ data:
           DEFAULT_PUSH_CREATE_PRIVATE: false
           ENABLE_PUSH_CREATE_USER: true
           ENABLE_PUSH_CREATE_ORG: true
-          DEFAULT_REPO_UNITS: [repo.code,repo.releases,repo.issues,repo.pulls]
+          DEFAULT_REPO_UNITS: "repo.code,repo.releases,repo.issues,repo.pulls"
           MAX_CREATION_LIMIT: 99
+        project:
+          PROJECT_BOARD_BASIC_KANBAN_TYPE: "Done, Doing, Todo"
+          # PROJECT_BOARD_BUG_TRIAGE_TYPE: Needs Triage, High Priority, Low Priority, Closed
         server:
-          ROOT_URL: "https://${forgejo_domain}"
           LANDING_PAGE: login
+          PROTOCOL: "https"
+          # ROOT_URL: "https://${forgejo_domain}"
+          # DOMAIN:
         openid:
           ENABLE_OPENID_SIGNUP: true
         service:
           DISABLE_REGISTRATION: false
           ENABLE_BASIC_AUTHENTICATION: false
           ALLOW_ONLY_EXTERNAL_REGISTRATION: true
+          DEFAULT_USER_VISIBILITY: "limited"
+          DEFAULT_ORG_MEMBER_VISIBLE: true
+          # EMAIL_DOMAIN_ALLOWLIST
+        admin:
+          SEND_NOTIFICATION_EMAIL_ON_NEW_USER: true
+        mailer:
+          ENABLED: "${outgoing_mail_enabled}"
+          SMTP_ADDR: "${outgoing_mail_smtp_host}"
+          SMTP_PORT: "${outgoing_mail_smtp_port}"
+          USER: "${outgoing_mail_smtp_user}"
+          PASSWD: "${outgoing_mail_smtp_password}"
+          FROM: "${outgoing_mail_from_address}"
+          # SUBJECT_PREFIX
+          # forcessl: true
+        cors:
+          ENABLED: true
+          # SCHEME: "https"
+          ALLOW_DOMAIN: "files.ftt.gmbh"
+          ALLOW_CREDENTIALS: true
         log:
           # LEVEL: "Debug"
       podAnnotations:
diff --git a/apps/ninja/invoiceninja-secrets/invoiceninja-variables.yaml b/apps/ninja/invoiceninja-secrets/invoiceninja-variables.yaml
index f6ba2d0..3043101 100644
--- a/apps/ninja/invoiceninja-secrets/invoiceninja-variables.yaml
+++ b/apps/ninja/invoiceninja-secrets/invoiceninja-variables.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   fields:
   - fieldName: app_key
-  - fieldName: password
+  - fieldName: invoiceninja_admin_password
   - fieldName: redis_password
   - fieldName: mariadb_password
   - fieldName: mariadb_root_password
diff --git a/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml b/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml
index d6c1728..0c49dae 100644
--- a/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml
+++ b/apps/ninja/invoiceninja/invoiceninja-values-configmap.yaml
@@ -49,7 +49,7 @@ data:
     appKey: "${app_key}"
     appURL: "https://${invoiceninja_domain}"
     userEmail: "${admin_email}"
-    userPassword: "${password}"
+    userPassword: "${invoiceninja_admin_password}"
     mailer: "smtp" # FIXME use "${outgoing_mail_enabled}"
     # https://github.com/invoiceninja/invoiceninja/blob/v5-stable/config/mail.php#L36
     extraEnvVars: