diff --git a/clusters/cl01tl/helm/matrix-synapse/templates/database.yaml b/clusters/cl01tl/helm/matrix-synapse/templates/database.yaml
new file mode 100644
index 000000000..0ff75917a
--- /dev/null
+++ b/clusters/cl01tl/helm/matrix-synapse/templates/database.yaml
@@ -0,0 +1,30 @@
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: matrix-synapse-postgresql-18-cluster-mautrix-discord-database
+  namespace: matrix-synapse
+  labels:
+    app.kubernetes.io/name: matrix-synapse-postgresql-18-cluster-mautrix-discord-database
+    app.kubernetes.io/instance: matrix-synapse
+    app.kubernetes.io/part-of: matrix-synapse
+spec:
+  cluster:
+    name: matrix-synapse-postgresql-18-cluster
+  name: mautrix-discord
+  owner: app
+
+---
+apiVersion: postgresql.cnpg.io/v1
+kind: Database
+metadata:
+  name: matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database
+  namespace: matrix-synapse
+  labels:
+    app.kubernetes.io/name: matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database
+    app.kubernetes.io/instance: matrix-synapse
+    app.kubernetes.io/part-of: matrix-synapse
+spec:
+  cluster:
+    name: matrix-synapse-postgresql-18-cluster
+  name: mautrix-whatsapp
+  owner: app
diff --git a/clusters/cl01tl/helm/matrix-synapse/values.yaml b/clusters/cl01tl/helm/matrix-synapse/values.yaml
index 1d1b72428..e840ae662 100644
--- a/clusters/cl01tl/helm/matrix-synapse/values.yaml
+++ b/clusters/cl01tl/helm/matrix-synapse/values.yaml
@@ -444,13 +444,13 @@ postgres-18-cluster:
       #   immediate: true
       #   schedule: "0 0 4 * * SAT"
       #   backupName: garage-remote
-  databases:
-    - name: mautrix-discord
-      ensure: present
-      owner: app
-    - name: mautrix-whatsapp
-      ensure: present
-      owner: app
+  # databases:
+  #   - name: mautrix-discord
+  #     ensure: present
+  #     owner: app
+  #   - name: mautrix-whatsapp
+  #     ensure: present
+  #     owner: app
 redis-replication-matrix-synapse:
   replicationNameOverride: redis-replication-matrix-synapse
   sentinelNameOverride: redis-sentinel-matrix-synapse