diff --git a/values/openfga/migration-job.yaml b/values/openfga/migration-job.yaml
index e7c53073..2b565ec7 100644
--- a/values/openfga/migration-job.yaml
+++ b/values/openfga/migration-job.yaml
@@ -33,9 +33,8 @@ spec:
             - name: OPENFGA_DATASTORE_URI
               valueFrom:
                 secretKeyRef:
-                  name: "staging-openfga-postgresql"
+                  name: "staging-openfga-db-superuser"
                   key: "uri"
-
           resources:
             {}
       restartPolicy: Never
diff --git a/values/openfga/values-prod.yaml b/values/openfga/values-prod.yaml
index 564bd320..73650055 100644
--- a/values/openfga/values-prod.yaml
+++ b/values/openfga/values-prod.yaml
@@ -2,7 +2,7 @@ replicaCount: 2
 
 datastore:
   engine: postgres
-  uriSecret: prod-openfga-postgresql
+  uriSecret: prod-openfga-db-superuser
   migrationType: initContainer
 
 postgresql:
@@ -44,7 +44,7 @@ extraObjects:
  - apiVersion: postgresql.cnpg.io/v1
    kind: Cluster
    metadata:
-     name: prod-openfga
+     name: prod-openfga-db
      namespace: openfga
    spec:
      instances: 2
diff --git a/values/openfga/values-staging.yaml b/values/openfga/values-staging.yaml
index 188c168d..d91044ab 100644
--- a/values/openfga/values-staging.yaml
+++ b/values/openfga/values-staging.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 
 datastore:
   engine: postgres
-  uriSecret: staging-openfga-postgresql
+  uriSecret: staging-openfga-db-superuser
   migrationType: initContainer
 
 postgresql:
@@ -44,7 +44,7 @@ extraObjects:
   - apiVersion: postgresql.cnpg.io/v1
     kind: Cluster
     metadata:
-      name: staging-openfga
+      name: staging-openfga-db
       namespace: openfga
     spec:
       instances: 1
@@ -64,15 +64,15 @@ extraObjects:
       externalClusters:
       - name: openfga
         connectionParameters:
-          host: prod-openfga-rw.openfga
+          host: prod-openfga-db-rw.openfga
           sslmode: verify-full
           user: streaming_replica
         sslCert:
           key: tls.crt
-          name: prod-openfga-replication
+          name: prod-openfga-db-replication
         sslKey:
           key: tls.key
-          name: prod-openfga-replication
+          name: prod-openfga-db-replication
         sslRootCert:
           key: ca.crt
-          name: prod-openfga-ca
+          name: prod-openfga-db-ca