diff --git a/clusters/homelab/apps/synapse/cnpg-cluster-mas.yaml b/clusters/homelab/apps/synapse/cnpg-cluster-mas.yaml
index 9efbd6a..a3fe919 100644
--- a/clusters/homelab/apps/synapse/cnpg-cluster-mas.yaml
+++ b/clusters/homelab/apps/synapse/cnpg-cluster-mas.yaml
@@ -19,8 +19,17 @@ spec:
         secretAccessKey:
           name: minio-cnpg-credentials
           key: ACCESS_SECRET_KEY
-    retentionPolicy: "30d"
+      retentionPolicy: "30d"
   bootstrap:
     initdb:
       database: mas
       owner: mas
+      secret:
+        name: synapse-secret
+  managed:
+    roles:
+      - name: mas
+        login: true
+        passwordSecret:
+          name: synapse-secret
+          key: MAS_DB_PASSWORD
\ No newline at end of file
diff --git a/clusters/homelab/apps/synapse/cnpg-cluster-mas.yaml.old b/clusters/homelab/apps/synapse/cnpg-cluster-mas.yaml.old
new file mode 100644
index 0000000..9efbd6a
--- /dev/null
+++ b/clusters/homelab/apps/synapse/cnpg-cluster-mas.yaml.old
@@ -0,0 +1,26 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Cluster
+metadata:
+  name: mas-db
+  namespace: synapse
+spec:
+  instances: 3
+  storage:
+    size: 2Gi
+    storageClass: longhorn
+  backup:
+    barmanObjectStore:
+      destinationPath: s3://cnpg-backups/mas
+      endpointURL: http://192.168.2.107:9010
+      s3Credentials:
+        accessKeyId:
+          name: minio-cnpg-credentials
+          key: ACCESS_KEY_ID
+        secretAccessKey:
+          name: minio-cnpg-credentials
+          key: ACCESS_SECRET_KEY
+    retentionPolicy: "30d"
+  bootstrap:
+    initdb:
+      database: mas
+      owner: mas
diff --git a/clusters/homelab/apps/synapse/cnpg-cluster-synapse.yaml b/clusters/homelab/apps/synapse/cnpg-cluster-synapse.yaml
index 1e06187..32c42e2 100644
--- a/clusters/homelab/apps/synapse/cnpg-cluster-synapse.yaml
+++ b/clusters/homelab/apps/synapse/cnpg-cluster-synapse.yaml
@@ -19,8 +19,17 @@ spec:
         secretAccessKey:
           name: minio-cnpg-credentials
           key: ACCESS_SECRET_KEY
-    retentionPolicy: "30d"
+      retentionPolicy: "30d"
   bootstrap:
     initdb:
       database: synapse
       owner: synapse
+      secret:
+        name: synapse-secret
+  managed:
+    roles:
+      - name: synapse
+        login: true
+        passwordSecret:
+          name: synapse-secret
+          key: SYNAPSE_DB_PASSWORD
\ No newline at end of file
diff --git a/clusters/homelab/apps/synapse/cnpg-cluster-synapse.yaml.old b/clusters/homelab/apps/synapse/cnpg-cluster-synapse.yaml.old
new file mode 100644
index 0000000..1e06187
--- /dev/null
+++ b/clusters/homelab/apps/synapse/cnpg-cluster-synapse.yaml.old
@@ -0,0 +1,26 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Cluster
+metadata:
+  name: synapse-db
+  namespace: synapse
+spec:
+  instances: 3
+  storage:
+    size: 5Gi
+    storageClass: longhorn
+  backup:
+    barmanObjectStore:
+      destinationPath: s3://cnpg-backups/synapse
+      endpointURL: http://192.168.2.107:9010
+      s3Credentials:
+        accessKeyId:
+          name: minio-cnpg-credentials
+          key: ACCESS_KEY_ID
+        secretAccessKey:
+          name: minio-cnpg-credentials
+          key: ACCESS_SECRET_KEY
+    retentionPolicy: "30d"
+  bootstrap:
+    initdb:
+      database: synapse
+      owner: synapse