diff --git a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/01-paradedb_cluster-assert.yaml b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/01-paradedb_cluster-assert.yaml
index 1b995d1d2..ef80c7118 100644
--- a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/01-paradedb_cluster-assert.yaml
+++ b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/01-paradedb_cluster-assert.yaml
@@ -1,6 +1,6 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: paradedb-paradedb-cluster
+  name: paradedb--cluster
 status:
   readyInstances: 2
diff --git a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/02-paradedb_write.yaml b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/02-paradedb_write.yaml
index df7dd9259..47818baef 100644
--- a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/02-paradedb_write.yaml
+++ b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/02-paradedb_write.yaml
@@ -12,7 +12,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-cluster-app
+                name: paradedb--cluster-app
                 key: uri
         image: alpine:3.19
         command: ['sh', '-c']
diff --git a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/03-paradedb_test.yaml b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/03-paradedb_test.yaml
index befadcfc5..d8caa6cc7 100644
--- a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/03-paradedb_test.yaml
+++ b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/03-paradedb_test.yaml
@@ -12,7 +12,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-cluster-app
+                name: paradedb--cluster-app
                 key: uri
         image: alpine:3.19
         command: ['sh', '-c']
diff --git a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/04-data_write.yaml b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/04-data_write.yaml
index aa8b243f0..3de227655 100644
--- a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/04-data_write.yaml
+++ b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/04-data_write.yaml
@@ -39,7 +39,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-cluster-superuser
+                name: paradedb--cluster-superuser
                 key: uri
         image: alpine:3.19
         command: ['sh', '-c']
diff --git a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup.yaml b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup.yaml
index d8ac63218..f59e3141a 100644
--- a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup.yaml
+++ b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup.yaml
@@ -5,4 +5,4 @@ metadata:
 spec:
   method: barmanObjectStore
   cluster:
-    name: paradedb-paradedb-cluster
+    name: paradedb--cluster
diff --git a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup_completed-assert.yaml b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup_completed-assert.yaml
index c1103592e..04171e552 100644
--- a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup_completed-assert.yaml
+++ b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup_completed-assert.yaml
@@ -4,7 +4,7 @@ metadata:
   name: post-init-backup
 spec:
   cluster:
-    name: paradedb-paradedb-cluster
+    name: paradedb--cluster
   method: barmanObjectStore
 status:
   phase: completed
diff --git a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup_running-assert.yaml b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup_running-assert.yaml
index cdb6605f2..ccc69f476 100644
--- a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup_running-assert.yaml
+++ b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-backup_running-assert.yaml
@@ -4,7 +4,7 @@ metadata:
   name: post-init-backup
 spec:
   cluster:
-    name: paradedb-paradedb-cluster
+    name: paradedb--cluster
   method: barmanObjectStore
 status:
   phase: running
diff --git a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-checkpoint.yaml b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-checkpoint.yaml
index 7d6abe4e4..1a7468052 100644
--- a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-checkpoint.yaml
+++ b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/05-checkpoint.yaml
@@ -12,7 +12,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-cluster-superuser
+                name: paradedb--cluster-superuser
                 key: uri
         image: alpine:3.19
         command: ['sh', '-c']
diff --git a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml
index 599a37a48..f39fd6d78 100644
--- a/charts/paradedb-cluster/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml
+++ b/charts/paradedb-cluster/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml
@@ -12,7 +12,7 @@ spec:
           - name: DB_URI
             valueFrom:
               secretKeyRef:
-                name: paradedb-paradedb-cluster-superuser
+                name: paradedb--cluster-superuser
                 key: uri
           - name: NAMESPACE
             valueFrom: