diff --git a/apps/do/vikunja/vikunja-values-configmap.yaml b/apps/do/vikunja/vikunja-values-configmap.yaml
index 8ff1570..04ccb6e 100644
--- a/apps/do/vikunja/vikunja-values-configmap.yaml
+++ b/apps/do/vikunja/vikunja-values-configmap.yaml
@@ -99,13 +99,11 @@ data:
       enabled: true
       commonLabels:
         stackspin.net/backupSet: "vikunja"
-      global:
-        postgresql:
-          auth:
-            database: vikunja
-            username: vikunja
-            password: "${postgresql_password}"
-            postgresPassword: "${postgresql_admin_password}"
+      auth:
+        database: vikunja
+        username: vikunja
+        password: "${postgresql_password}"
+        postgresPassword: "${postgresql_admin_password}"
       primary:
         persistence:
           existingClaim: vikunja-postgres
diff --git a/apps/forge/forgejo/forgejo-values-configmap.yaml b/apps/forge/forgejo/forgejo-values-configmap.yaml
index dc61de5..4afe14b 100644
--- a/apps/forge/forgejo/forgejo-values-configmap.yaml
+++ b/apps/forge/forgejo/forgejo-values-configmap.yaml
@@ -86,13 +86,11 @@ data:
       enabled: true
       commonLabels:
         stackspin.net/backupSet: "forgejo"
-      global:
-        postgresql:
-          auth:
-            database: gitea
-            username: gitea
-            password: gitea # "${postgresql_password}"
-            postgresPassword: "${postgresql_admin_password}"
+      auth:
+        database: gitea
+        username: gitea
+        password: gitea # "${postgresql_password}"
+        postgresPassword: "${postgresql_admin_password}"
       primary:
         podAnnotations:
           backup.velero.io/backup-volumes: "data"
diff --git a/apps/meet/calcom-kustomization.yaml b/apps/meet/calcom-kustomization.yaml
index 7fd0742..cef0880 100644
--- a/apps/meet/calcom-kustomization.yaml
+++ b/apps/meet/calcom-kustomization.yaml
@@ -26,8 +26,6 @@ spec:
         name: stackspin-cluster-variables
       - kind: ConfigMap
         name: stackspin-calcom-kustomization-variables
-      - kind: Secret
-        name: stackspin-calcom-variables
       # OIDC
       - kind: Secret
         name: stackspin-calcom-oauth-variables
diff --git a/apps/meet/calcom-secrets/calcom-variables.yaml b/apps/meet/calcom-secrets/calcom-keys.yaml
similarity index 59%
rename from apps/meet/calcom-secrets/calcom-variables.yaml
rename to apps/meet/calcom-secrets/calcom-keys.yaml
index 1275ec7..9f75874 100644
--- a/apps/meet/calcom-secrets/calcom-variables.yaml
+++ b/apps/meet/calcom-secrets/calcom-keys.yaml
@@ -1,14 +1,11 @@
----
 apiVersion: secretgenerator.mittwald.de/v1alpha1
 kind: StringSecret
 metadata:
-  name: stackspin-calcom-variables
-  namespace: flux-system
+  name: stackspin-calcom-keys
+  namespace: stackspout
 spec:
   # DATABASE_URL
   # NEXT_PUBLIC_WEBAPP_URL
   fields:
-  - fieldName: postgresql_password
-  - fieldName: postgresql_postgres_password
   - fieldName: NEXTAUTH_SECRET
   - fieldName: CALENDSO_ENCRYPTION_KEY
diff --git a/apps/meet/calcom-secrets/calcom-oauth-secret.yaml b/apps/meet/calcom-secrets/calcom-oauth-secret.yaml
index 6115fb2..2b918f2 100644
--- a/apps/meet/calcom-secrets/calcom-oauth-secret.yaml
+++ b/apps/meet/calcom-secrets/calcom-oauth-secret.yaml
@@ -1,4 +1,3 @@
----
 apiVersion: secretgenerator.mittwald.de/v1alpha1
 kind: StringSecret
 metadata:
diff --git a/apps/meet/calcom-secrets/calcom-postgres.yaml b/apps/meet/calcom-secrets/calcom-postgres.yaml
new file mode 100644
index 0000000..96d5b9a
--- /dev/null
+++ b/apps/meet/calcom-secrets/calcom-postgres.yaml
@@ -0,0 +1,9 @@
+apiVersion: secretgenerator.mittwald.de/v1alpha1
+kind: StringSecret
+metadata:
+  name: stackspin-calcom-postgres
+  namespace: stackspout
+spec:
+  fields:
+  - fieldName: postgresql_password
+  - fieldName: postgresql_postgres_password
diff --git a/apps/meet/calcom/calcom-values-configmap.yaml b/apps/meet/calcom/calcom-values-configmap.yaml
index 60b4ed3..58b2b6d 100644
--- a/apps/meet/calcom/calcom-values-configmap.yaml
+++ b/apps/meet/calcom/calcom-values-configmap.yaml
@@ -6,16 +6,15 @@ metadata:
 data:
   values.yaml: |
     postgresql:
+      # https://github.com/Pyrrha/calcom-helm/blob/main/charts/calcom-stack/values.yaml
       enabled: true
       commonLabels:
         stackspin.net/backupSet: "calcom"
-      #global:
-      #  postgresql:
+      # https://github.com/bitnami/charts/tree/main/bitnami/postgresql/#postgresql-common-parameters
       auth:
         database: calcom
         username: calcom
-        password: "${postgresql_password}"
-        postgresPassword: "${postgresql_postgres_password}"
+        existingSecret: "stackspin-calcom-postgres"
       primary:
         persistence:
           existingClaim: calcom-postgres
@@ -23,7 +22,8 @@ data:
           backup.velero.io/backup-volumes: "data"
 
     calcom:
-      secretRef: "stackspin-calcom-variables"
+      # https://github.com/Pyrrha/calcom-helm/blob/main/charts/calcom/values.yaml
+      secretRef: "stackspin-calcom-keys"
       commonLabels:
         stackspin.net/backupSet: "calcom"
       podLabels: