diff --git a/class/defaults.yml b/class/defaults.yml
index a4c0a4ca..9d18e6a0 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -62,7 +62,7 @@ parameters:
         version: v2.2.1
       postgresql:
         source: https://charts.bitnami.com/bitnami
-        version: v12.5.6
+        version: 12.6.4
     # FQDN should be overwritten on the cluster level
     fqdn: keycloak.example.com
     # Disables dynamically resolving the hostname from request headers.
diff --git a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/networkpolicy.yaml b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/networkpolicy.yaml
index 42bab512..a624cdcd 100644
--- a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/networkpolicy.yaml
+++ b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/networkpolicy.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-12.5.6
+    helm.sh/chart: postgresql-12.6.4
   name: keycloak-postgresql-ingress
   namespace: syn-builtin
 spec:
diff --git a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/statefulset.yaml b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/statefulset.yaml
index 86ca17c2..aeeff5ea 100644
--- a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/statefulset.yaml
+++ b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: builtin
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    helm.sh/chart: postgresql-12.5.6
+    helm.sh/chart: postgresql-12.6.4
   name: keycloak-postgresql
   namespace: syn-builtin
 spec:
@@ -28,7 +28,7 @@ spec:
         app.kubernetes.io/instance: keycloak
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: postgresql
-        helm.sh/chart: postgresql-12.5.6
+        helm.sh/chart: postgresql-12.6.4
       name: keycloak-postgresql
     spec:
       affinity:
@@ -56,17 +56,17 @@ spec:
               value: /bitnami/postgresql/data
             - name: POSTGRES_USER
               value: keycloak
-            - name: POSTGRES_POSTGRES_PASSWORD
+            - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: postgres-password
+                  key: password
                   name: keycloak-postgresql
-            - name: POSTGRES_PASSWORD
+            - name: POSTGRES_POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: password
+                  key: postgres-password
                   name: keycloak-postgresql
-            - name: POSTGRES_DB
+            - name: POSTGRES_DATABASE
               value: keycloak
             - name: POSTGRESQL_ENABLE_LDAP
               value: 'no'
@@ -186,7 +186,9 @@ spec:
     rollingUpdate: {}
     type: RollingUpdate
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
       spec:
         accessModes:
diff --git a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/svc-headless.yaml b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/svc-headless.yaml
index bb13dd96..c5e2b37a 100644
--- a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/svc-headless.yaml
+++ b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/svc-headless.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-12.5.6
+    helm.sh/chart: postgresql-12.6.4
     service.alpha.kubernetes.io/tolerate-unready-endpoints: 'true'
   name: keycloak-postgresql-hl
   namespace: syn-builtin
diff --git a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/svc.yaml b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/svc.yaml
index f4543e5e..d0871ed5 100644
--- a/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/svc.yaml
+++ b/tests/golden/builtin/builtin/builtin/01_keycloak_helmchart/postgresql/templates/primary/svc.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-12.5.6
+    helm.sh/chart: postgresql-12.6.4
   name: keycloak-postgresql
   namespace: syn-builtin
 spec:
diff --git a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/networkpolicy.yaml b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/networkpolicy.yaml
index bc583379..20499322 100644
--- a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/networkpolicy.yaml
+++ b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/networkpolicy.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-12.5.6
+    helm.sh/chart: postgresql-12.6.4
   name: keycloak-postgresql-ingress
   namespace: syn-openshift-postgres
 spec:
diff --git a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/statefulset.yaml b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/statefulset.yaml
index 37bd55e9..237b36e2 100644
--- a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/statefulset.yaml
+++ b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: openshift-postgres
     app.kubernetes.io/managed-by: commodore
     app.kubernetes.io/name: keycloak
-    helm.sh/chart: postgresql-12.5.6
+    helm.sh/chart: postgresql-12.6.4
   name: keycloak-postgresql
   namespace: syn-openshift-postgres
 spec:
@@ -28,7 +28,7 @@ spec:
         app.kubernetes.io/instance: keycloak
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: postgresql
-        helm.sh/chart: postgresql-12.5.6
+        helm.sh/chart: postgresql-12.6.4
       name: keycloak-postgresql
     spec:
       affinity:
@@ -56,17 +56,17 @@ spec:
               value: /bitnami/postgresql/data
             - name: POSTGRES_USER
               value: keycloak
-            - name: POSTGRES_POSTGRES_PASSWORD
+            - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: postgres-password
+                  key: password
                   name: keycloak-postgresql
-            - name: POSTGRES_PASSWORD
+            - name: POSTGRES_POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  key: password
+                  key: postgres-password
                   name: keycloak-postgresql
-            - name: POSTGRES_DB
+            - name: POSTGRES_DATABASE
               value: keycloak
             - name: POSTGRESQL_ENABLE_LDAP
               value: 'no'
@@ -185,7 +185,9 @@ spec:
     rollingUpdate: {}
     type: RollingUpdate
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
       spec:
         accessModes:
diff --git a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/svc-headless.yaml b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/svc-headless.yaml
index 97566948..bca7b2b5 100644
--- a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/svc-headless.yaml
+++ b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/svc-headless.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-12.5.6
+    helm.sh/chart: postgresql-12.6.4
     service.alpha.kubernetes.io/tolerate-unready-endpoints: 'true'
   name: keycloak-postgresql-hl
   namespace: syn-openshift-postgres
diff --git a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/svc.yaml b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/svc.yaml
index d81678b5..0345d7c6 100644
--- a/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/svc.yaml
+++ b/tests/golden/openshift-postgres/openshift-postgres/openshift-postgres/01_keycloak_helmchart/postgresql/templates/primary/svc.yaml
@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/instance: keycloak
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-12.5.6
+    helm.sh/chart: postgresql-12.6.4
   name: keycloak-postgresql
   namespace: syn-openshift-postgres
 spec: