diff --git a/values/keycloak/values-prod.yaml b/values/keycloak/values-prod.yaml
index 6135d86a..10921d2e 100644
--- a/values/keycloak/values-prod.yaml
+++ b/values/keycloak/values-prod.yaml
@@ -79,20 +79,26 @@ initContainers: |
       - name: theme
         mountPath: /keycloak/themes/oceanbox
 
-# extraDeploy:
-# - apiVersion: postgresql.cnpg.io/v1
-#   kind: Cluster
-#   metadata:
-#     name: prod-keycloak
-#     namespace: keycloak
-#   spec:
-#     instances: 2
-#     imageName: ghcr.io/cloudnative-pg/postgresql:17.2-27-bookworm
-#     automountServiceAccountToken: true
-#     storage:
-#       resizeInUseVolumes: true
-#       size: 10Gi
-#     backup:
-#       retentionPolicy: 60d
-#       target: prefer-standby
+automountServiceAccountToken: true
+
+serviceAccount:
+  create: true
+  automountServiceAccountToken: true
+
+extraDeploy:
+- apiVersion: postgresql.cnpg.io/v1
+  kind: Cluster
+  metadata:
+    name: prod-keycloak
+    namespace: keycloak
+  spec:
+    instances: 2
+    imageName: ghcr.io/cloudnative-pg/postgresql:17.2-27-bookworm
+    automountServiceAccountToken: true
+    storage:
+      resizeInUseVolumes: true
+      size: 10Gi
+    backup:
+      retentionPolicy: 60d
+      target: prefer-standby