diff --git a/apps/do/vikunja/vikunja-values-configmap.yaml b/apps/do/vikunja/vikunja-values-configmap.yaml
index 6bf3c7b..5618691 100644
--- a/apps/do/vikunja/vikunja-values-configmap.yaml
+++ b/apps/do/vikunja/vikunja-values-configmap.yaml
@@ -98,16 +98,17 @@ data:
       backup.velero.io/backup-volumes: "data"
     postgresql:
       enabled: true
+      commonLabels:
+        stackspin.net/backupSet: "vikunja"
       global:
-        commonLabels:
-          stackspin.net/backupSet: "vikunja"
         postgresql:
-          database: vikunja
-          username: vikunja
-          password: "${postgresql_password}"
+          auth:
+            database: vikunja
+            username: vikunja
+            password: "${postgresql_password}"
+      primary:
         persistence:
           existingClaim: vikunja-postgres
-      primary:
         podAnnotations:
           backup.velero.io/backup-volumes: "data"
     typesense:
diff --git a/apps/forge/forgejo/forgejo-values-configmap.yaml b/apps/forge/forgejo/forgejo-values-configmap.yaml
index bfc139c..366fbfb 100644
--- a/apps/forge/forgejo/forgejo-values-configmap.yaml
+++ b/apps/forge/forgejo/forgejo-values-configmap.yaml
@@ -81,18 +81,21 @@ data:
       enabled: false
     postgresql:
       enabled: true
+      commonLabels:
+        stackspin.net/backupSet: "forgejo"
       global:
-        commonLabels:
-          stackspin.net/backupSet: "forgejo"
         postgresql:
-          database: gitea
-          username: gitea
-          password: gitea # "${postgresql_password}"
+          auth:
+            database: gitea
+            username: gitea
+            password: gitea # "${postgresql_password}"
         persistence:
           existingClaim: forgejo-postgres
       primary:
         podAnnotations:
           backup.velero.io/backup-volumes: "data"
+        persistence:
+          existingClaim: vikunja-postgres
 
     service:
       ssh: