diff --git a/values/keycloak/cluster-prod.yaml b/values/keycloak/cluster-prod.yaml
new file mode 100644
index 00000000..7175362c
--- /dev/null
+++ b/values/keycloak/cluster-prod.yaml
@@ -0,0 +1,15 @@
+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
+  storage:
+    resizeInUseVolumes: true
+    size: 10Gi
+  backup:
+    retentionPolicy: 60d
+    target: prefer-standby
+
diff --git a/values/keycloak/prod/cluster.yaml b/values/keycloak/prod/cluster.yaml
new file mode 100644
index 00000000..7175362c
--- /dev/null
+++ b/values/keycloak/prod/cluster.yaml
@@ -0,0 +1,15 @@
+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
+  storage:
+    resizeInUseVolumes: true
+    size: 10Gi
+  backup:
+    retentionPolicy: 60d
+    target: prefer-standby
+
diff --git a/values/keycloak/values-prod.yaml b/values/keycloak/values-prod.yaml
index b4b6cde3..6135d86a 100644
--- a/values/keycloak/values-prod.yaml
+++ b/values/keycloak/values-prod.yaml
@@ -79,19 +79,20 @@ 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
-    storage:
-      resizeInUseVolumes: true
-      size: 10Gi
-    backup:
-      retentionPolicy: 60d
-      target: prefer-standby
+# 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