diff --git a/values/openfga/values-prod.yaml b/values/openfga/values-prod.yaml
index 12aa9583..ef260f43 100644
--- a/values/openfga/values-prod.yaml
+++ b/values/openfga/values-prod.yaml
@@ -3,16 +3,28 @@ replicaCount: 2
 datastore:
   engine: postgres
   uriSecret: prod-openfga-postgresql
+  migrationType: initContainer
 
 postgresql:
-  enabled: true
-  auth:
-    existingSecret: prod-openfga-postgresql
-    secretKeys:
-       userPasswordKey: postgres-password
+  enabled: false
+
+playground:
+  enabled: false
+
+telemetry:
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: true
+    enableRPCHistograms: true
+  trace:
+    enabled: true
+    otlp:
+      endpoint: opentelemetry-collector.otel.svc.cluster.local:4317
+    sampleRatio: 0.1
 
 ingress:
-  enabled: true
+  enabled: false
   className: nginx
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-staging
@@ -24,8 +36,22 @@ ingress:
         - path: /
           pathType: ImplementationSpecific
   tls:
-   - secretName: staging-openfga-tls
+   - secretName: prod-openfga-tls
      hosts:
        - openfga.srv.oceanbox.io
 
-
+extraObjects:
+  - apiVersion: postgresql.cnpg.io/v1
+    kind: Cluster
+    metadata:
+      name: prod-openfga
+      namespace: openfga
+    spec:
+      instances: 1
+      # imageName: ghcr.io/cloudnative-pg/postgres:15-3.3
+      storage:
+        resizeInUseVolumes: true
+        size: 10Gi
+      backup:
+        retentionPolicy: 60d
+        target: prefer-standby
diff --git a/values/openfga/values-staging.yaml b/values/openfga/values-staging.yaml
index d506c3a3..feed5475 100644
--- a/values/openfga/values-staging.yaml
+++ b/values/openfga/values-staging.yaml
@@ -3,16 +3,28 @@ replicaCount: 1
 datastore:
   engine: postgres
   uriSecret: staging-openfga-postgresql
+  migrationType: initContainer
 
 postgresql:
-  enabled: true
-  auth:
-    existingSecret: staging-openfga-postgresql
-    secretKeys:
-       userPasswordKey: postgres-password
+  enabled: false
+
+playground:
+  enabled: false
+
+telemetry:
+  metrics:
+    enabled: true
+    serviceMonitor:
+      enabled: true
+    enableRPCHistograms: true
+  trace:
+    enabled: true
+    otlp:
+      endpoint: opentelemetry-collector.otel.svc.cluster.local:4317
+    sampleRatio: 0.1
 
 ingress:
-  enabled: true
+  enabled: false
   className: nginx
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-staging
@@ -27,3 +39,40 @@ ingress:
    - secretName: staging-openfga-tls
      hosts:
        - openfga.dev.oceanbox.io
+
+extraObjects:
+  - apiVersion: postgresql.cnpg.io/v1
+    kind: Cluster
+    metadata:
+      name: staging-openfga
+      namespace: openfga
+    spec:
+      instances: 1
+      # imageName: ghcr.io/cloudnative-pg/postgres:15-3.3
+      storage:
+        resizeInUseVolumes: true
+        size: 10Gi
+      backup:
+        retentionPolicy: 60d
+        target: prefer-standby
+      bootstrap:
+        pg_basebackup:
+          database: ""
+          owner: ""
+          source: openfga
+      enableSuperuserAccess: true
+      externalClusters:
+      - name: openfga
+        connectionParameters:
+          host: prod-openfga-rw.openfga.svc.cluster.local
+          sslmode: verify-full
+          user: streaming_replica
+        sslCert:
+          key: tls.crt
+          name: prod-openfga-replication
+        sslKey:
+          key: tls.key
+          name: prodopenfga-replication
+        sslRootCert:
+          key: ca.crt
+          name: prod-openfga-ca