diff --git a/apps/do/vikunja/vikunja-values-configmap.yaml b/apps/do/vikunja/vikunja-values-configmap.yaml
index 04ccb6e..8ff1570 100644
--- a/apps/do/vikunja/vikunja-values-configmap.yaml
+++ b/apps/do/vikunja/vikunja-values-configmap.yaml
@@ -99,11 +99,13 @@ data:
       enabled: true
       commonLabels:
         stackspin.net/backupSet: "vikunja"
-      auth:
-        database: vikunja
-        username: vikunja
-        password: "${postgresql_password}"
-        postgresPassword: "${postgresql_admin_password}"
+      global:
+        postgresql:
+          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 4afe14b..dc61de5 100644
--- a/apps/forge/forgejo/forgejo-values-configmap.yaml
+++ b/apps/forge/forgejo/forgejo-values-configmap.yaml
@@ -86,11 +86,13 @@ data:
       enabled: true
       commonLabels:
         stackspin.net/backupSet: "forgejo"
-      auth:
-        database: gitea
-        username: gitea
-        password: gitea # "${postgresql_password}"
-        postgresPassword: "${postgresql_admin_password}"
+      global:
+        postgresql:
+          auth:
+            database: gitea
+            username: gitea
+            password: gitea # "${postgresql_password}"
+            postgresPassword: "${postgresql_admin_password}"
       primary:
         podAnnotations:
           backup.velero.io/backup-volumes: "data"