diff --git a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-cluster-mautrix-discord-database.yaml b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-cluster-mautrix-discord-database.yaml
new file mode 100644
index 000000000..a7dd2cde5
--- /dev/null
+++ b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-cluster-mautrix-discord-database.yaml
@@ -0,0 +1,14 @@
+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
diff --git a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database.yaml b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database.yaml
new file mode 100644
index 000000000..ef44e60da
--- /dev/null
+++ b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-cluster-mautrix-whatsapp-database.yaml
@@ -0,0 +1,14 @@
+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/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml
deleted file mode 100644
index 5f3c031c1..000000000
--- a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-discord.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Database
-metadata:
-  name: matrix-synapse-postgresql-18-database-mautrix-discord
-  namespace: matrix-synapse
-  labels:
-    helm.sh/chart: postgres-18-cluster-7.1.1
-    app.kubernetes.io/name: matrix-synapse-postgresql-18
-    app.kubernetes.io/instance: matrix-synapse
-    app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.1.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  name: mautrix-discord
-  cluster:
-    name: matrix-synapse-postgresql-18
-  ensure: present
-  owner: app
-  template: template1
-  encoding: UTF8
-  databaseReclaimPolicy: retain
diff --git a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml b/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml
deleted file mode 100644
index c0283a60e..000000000
--- a/clusters/cl01tl/manifests/matrix-synapse/Database-matrix-synapse-postgresql-18-database-mautrix-whatsapp.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Database
-metadata:
-  name: matrix-synapse-postgresql-18-database-mautrix-whatsapp
-  namespace: matrix-synapse
-  labels:
-    helm.sh/chart: postgres-18-cluster-7.1.1
-    app.kubernetes.io/name: matrix-synapse-postgresql-18
-    app.kubernetes.io/instance: matrix-synapse
-    app.kubernetes.io/part-of: matrix-synapse
-    app.kubernetes.io/version: "7.1.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  name: mautrix-whatsapp
-  cluster:
-    name: matrix-synapse-postgresql-18
-  ensure: present
-  owner: app
-  template: template1
-  encoding: UTF8
-  databaseReclaimPolicy: retain