diff --git a/kubernetes/apps/database/cloudnative-pg/app/kustomization.yaml b/kubernetes/apps/database/cloudnative-pg/app/kustomization.yaml
index c05b3fc..64dcc48 100644
--- a/kubernetes/apps/database/cloudnative-pg/app/kustomization.yaml
+++ b/kubernetes/apps/database/cloudnative-pg/app/kustomization.yaml
@@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: fediverse
 resources:
-  - ./externalsecret.yaml
   - ./helmrelease.yaml
 configMapGenerator:
   - name: cloudnative-pg-dashboard
diff --git a/kubernetes/apps/fediverse/mastodon/app/cnpg/cluster.yaml b/kubernetes/apps/fediverse/mastodon/app/cnpg/cluster.yaml
index cf30b49..c6860d0 100644
--- a/kubernetes/apps/fediverse/mastodon/app/cnpg/cluster.yaml
+++ b/kubernetes/apps/fediverse/mastodon/app/cnpg/cluster.yaml
@@ -26,7 +26,7 @@ spec:
     enablePodMonitor: true
   backup:
     recovery:
-      source: clusterBackup
+      source: &previousCluster postgres-v3
     retentionPolicy: 30d
     barmanObjectStore:
       wal:
@@ -43,16 +43,17 @@ spec:
           name: cloudnative-pg-secret
           key: aws-secret-access-key
   externalClusters:
-    - name: clusterBackup
+    - name: *previousCluster
       barmanObjectStore:
-        destinationPath: https://${SECRET_CLOUDFLARE_ACCOUNT_ID}.r2.cloudflarestorage.com
-        s3Credentials:
-        accessKeyId:
-          name: cloudnative-pg-secret
-          key: aws-access-key-id
-        secretAccessKey:
-          name: cloudnative-pg-secret
-          key: aws-secret-access-key
         wal:
-          maxParallel: 8
           compression: bzip2
+          maxParallel: 8
+        destinationPath: s3://valinor-cnpg/
+        endpointURL: https://${SECRET_CLOUDFLARE_ACCOUNT_ID}.r2.cloudflarestorage.com
+        s3Credentials:
+          accessKeyId:
+            name: cloudnative-pg-secret
+            key: aws-access-key-id
+          secretAccessKey:
+            name: cloudnative-pg-secret
+            key: aws-secret-access-key
diff --git a/kubernetes/apps/database/cloudnative-pg/app/externalsecret.yaml b/kubernetes/apps/fediverse/mastodon/app/cnpg/externalsecret.yaml
similarity index 100%
rename from kubernetes/apps/database/cloudnative-pg/app/externalsecret.yaml
rename to kubernetes/apps/fediverse/mastodon/app/cnpg/externalsecret.yaml
diff --git a/kubernetes/apps/fediverse/mastodon/app/cnpg/kustomization.yaml b/kubernetes/apps/fediverse/mastodon/app/cnpg/kustomization.yaml
index f3e27b6..9aef4e2 100644
--- a/kubernetes/apps/fediverse/mastodon/app/cnpg/kustomization.yaml
+++ b/kubernetes/apps/fediverse/mastodon/app/cnpg/kustomization.yaml
@@ -6,4 +6,4 @@ resources:
   - ./cluster.yaml
   - ./scheduledbackup.yaml
   - ./prometheusrule.yaml
-  # - ./service.yaml
+  - ./externalsecret.yaml
diff --git a/kubernetes/apps/fediverse/mastodon/ks.yaml b/kubernetes/apps/fediverse/mastodon/ks.yaml
index 55eddae..79f1f93 100644
--- a/kubernetes/apps/fediverse/mastodon/ks.yaml
+++ b/kubernetes/apps/fediverse/mastodon/ks.yaml
@@ -174,7 +174,7 @@ spec:
   dependsOn:
     - name: cluster-apps-cloudnative-pg
     - name: cluster-apps-external-secrets-stores
-  path: ./kubernetes/apps/fediverse/app/mastodon/cnpg
+  path: ./kubernetes/apps/fediverse/mastodon/app/cnpg
   prune: true
   sourceRef:
     kind: GitRepository