diff --git a/charts/camunda-platform-8.2/charts/zeebe/templates/statefulset.yaml b/charts/camunda-platform-8.2/charts/zeebe/templates/statefulset.yaml
index a1fa96d07c..1fef50352d 100644
--- a/charts/camunda-platform-8.2/charts/zeebe/templates/statefulset.yaml
+++ b/charts/camunda-platform-8.2/charts/zeebe/templates/statefulset.yaml
@@ -208,23 +208,25 @@ spec:
 
   {{- if eq .Values.persistenceType "disk" }}
   volumeClaimTemplates:
-  - metadata:
-      name: data
-    spec:
-      accessModes: {{ .Values.pvcAccessModes }}
-      {{- if .Values.pvcStorageClassName }}
-      {{- if (eq "-" .Values.pvcStorageClassName) }}
-      storageClassName: ""
-      {{- else }}
-      storageClassName: {{ .Values.pvcStorageClassName }}
-      {{- end }}
-      {{- end }}
-      {{- if .Values.pvcSelector }}
-      {{- with .Values.pvcSelector }}
-      selector: {{ toYaml . | nindent 10 }}
-      {{- end }}
-      {{- end }}
-      resources:
-        requests:
-          storage: {{ .Values.pvcSize | quote }}
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
+        name: data
+      spec:
+        accessModes: {{ .Values.pvcAccessModes }}
+        {{- if .Values.pvcStorageClassName }}
+        {{- if (eq "-" .Values.pvcStorageClassName) }}
+        storageClassName: ""
+        {{- else }}
+        storageClassName: {{ .Values.pvcStorageClassName }}
+        {{- end }}
+        {{- end }}
+        {{- if .Values.pvcSelector }}
+        {{- with .Values.pvcSelector }}
+        selector: {{ toYaml . | nindent 10 }}
+        {{- end }}
+        {{- end }}
+        resources:
+          requests:
+            storage: {{ .Values.pvcSize | quote }}
   {{- end }}
diff --git a/charts/camunda-platform-8.2/test/unit/zeebe/golden/statefulset.golden.yaml b/charts/camunda-platform-8.2/test/unit/zeebe/golden/statefulset.golden.yaml
index 9d952883f2..3fda85c979 100644
--- a/charts/camunda-platform-8.2/test/unit/zeebe/golden/statefulset.golden.yaml
+++ b/charts/camunda-platform-8.2/test/unit/zeebe/golden/statefulset.golden.yaml
@@ -158,10 +158,12 @@ spec:
                 - zeebe-broker
             topologyKey: kubernetes.io/hostname
   volumeClaimTemplates:
-  - metadata:
-      name: data
-    spec:
-      accessModes: [ReadWriteOnce]
-      resources:
-        requests:
-          storage: "32Gi"
\ No newline at end of file
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
+        name: data
+      spec:
+        accessModes: [ReadWriteOnce]
+        resources:
+          requests:
+            storage: "32Gi"
\ No newline at end of file
diff --git a/charts/camunda-platform-8.3/templates/zeebe/statefulset.yaml b/charts/camunda-platform-8.3/templates/zeebe/statefulset.yaml
index ebeb4d5c50..8e7a1cd764 100644
--- a/charts/camunda-platform-8.3/templates/zeebe/statefulset.yaml
+++ b/charts/camunda-platform-8.3/templates/zeebe/statefulset.yaml
@@ -227,7 +227,9 @@ spec:
 
   {{- if eq .Values.zeebe.persistenceType "disk" }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
       spec:
         accessModes: {{ .Values.zeebe.pvcAccessModes }}
diff --git a/charts/camunda-platform-8.3/test/unit/zeebe/golden/statefulset.golden.yaml b/charts/camunda-platform-8.3/test/unit/zeebe/golden/statefulset.golden.yaml
index a14163008a..8678f0346c 100644
--- a/charts/camunda-platform-8.3/test/unit/zeebe/golden/statefulset.golden.yaml
+++ b/charts/camunda-platform-8.3/test/unit/zeebe/golden/statefulset.golden.yaml
@@ -171,7 +171,9 @@ spec:
             topologyKey: kubernetes.io/hostname
 # yamllint enable
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
       spec:
         accessModes: [ReadWriteOnce]
diff --git a/charts/camunda-platform-8.4/templates/zeebe/statefulset.yaml b/charts/camunda-platform-8.4/templates/zeebe/statefulset.yaml
index 0fcd6c9b93..b4cf6a86d2 100644
--- a/charts/camunda-platform-8.4/templates/zeebe/statefulset.yaml
+++ b/charts/camunda-platform-8.4/templates/zeebe/statefulset.yaml
@@ -227,7 +227,9 @@ spec:
 
   {{- if eq .Values.zeebe.persistenceType "disk" }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
         annotations:
           {{- toYaml .Values.zeebe.pvcAnnotations | nindent 10 }}
diff --git a/charts/camunda-platform-8.4/test/unit/zeebe/golden/statefulset.golden.yaml b/charts/camunda-platform-8.4/test/unit/zeebe/golden/statefulset.golden.yaml
index b4c36a1c8f..6d03274bf6 100644
--- a/charts/camunda-platform-8.4/test/unit/zeebe/golden/statefulset.golden.yaml
+++ b/charts/camunda-platform-8.4/test/unit/zeebe/golden/statefulset.golden.yaml
@@ -171,7 +171,9 @@ spec:
             topologyKey: kubernetes.io/hostname
 # yamllint enable
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
         annotations:
           {}
diff --git a/charts/camunda-platform-alpha/templates/zeebe/statefulset.yaml b/charts/camunda-platform-alpha/templates/zeebe/statefulset.yaml
index 48c5db0f13..18183712fd 100644
--- a/charts/camunda-platform-alpha/templates/zeebe/statefulset.yaml
+++ b/charts/camunda-platform-alpha/templates/zeebe/statefulset.yaml
@@ -273,7 +273,9 @@ spec:
 
   {{- if eq .Values.zeebe.persistenceType "disk" }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
         annotations:
           {{- toYaml .Values.zeebe.pvcAnnotations | nindent 10 }}
diff --git a/charts/camunda-platform-alpha/test/unit/zeebe/golden/statefulset.golden.yaml b/charts/camunda-platform-alpha/test/unit/zeebe/golden/statefulset.golden.yaml
index f00c220a01..3ea3b846dd 100644
--- a/charts/camunda-platform-alpha/test/unit/zeebe/golden/statefulset.golden.yaml
+++ b/charts/camunda-platform-alpha/test/unit/zeebe/golden/statefulset.golden.yaml
@@ -167,7 +167,9 @@ spec:
             topologyKey: kubernetes.io/hostname
 # yamllint enable
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
         annotations:
           {}
diff --git a/charts/camunda-platform-latest/templates/zeebe/statefulset.yaml b/charts/camunda-platform-latest/templates/zeebe/statefulset.yaml
index 45c7969065..ac60f0ffc6 100644
--- a/charts/camunda-platform-latest/templates/zeebe/statefulset.yaml
+++ b/charts/camunda-platform-latest/templates/zeebe/statefulset.yaml
@@ -258,7 +258,9 @@ spec:
 
   {{- if eq .Values.zeebe.persistenceType "disk" }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
         annotations:
           {{- toYaml .Values.zeebe.pvcAnnotations | nindent 10 }}
diff --git a/charts/camunda-platform-latest/test/unit/zeebe/golden/statefulset.golden.yaml b/charts/camunda-platform-latest/test/unit/zeebe/golden/statefulset.golden.yaml
index 17154ce216..97cb3414a8 100644
--- a/charts/camunda-platform-latest/test/unit/zeebe/golden/statefulset.golden.yaml
+++ b/charts/camunda-platform-latest/test/unit/zeebe/golden/statefulset.golden.yaml
@@ -162,7 +162,9 @@ spec:
             topologyKey: kubernetes.io/hostname
 # yamllint enable
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
         annotations:
           {}
diff --git a/charts/web-modeler-postgresql/templates/primary/statefulset.yaml b/charts/web-modeler-postgresql/templates/primary/statefulset.yaml
index 3fd77f4afb..04e92475f1 100644
--- a/charts/web-modeler-postgresql/templates/primary/statefulset.yaml
+++ b/charts/web-modeler-postgresql/templates/primary/statefulset.yaml
@@ -608,7 +608,9 @@ spec:
           emptyDir: {}
   {{- else }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
         {{- if .Values.primary.persistence.annotations }}
         annotations: {{- include "common.tplvalues.render" (dict "value" .Values.primary.persistence.annotations "context" $) | nindent 10 }}
diff --git a/charts/web-modeler-postgresql/templates/read/statefulset.yaml b/charts/web-modeler-postgresql/templates/read/statefulset.yaml
index b3ff1da693..227ea120f1 100644
--- a/charts/web-modeler-postgresql/templates/read/statefulset.yaml
+++ b/charts/web-modeler-postgresql/templates/read/statefulset.yaml
@@ -504,7 +504,9 @@ spec:
           emptyDir: {}
   {{- else }}
   volumeClaimTemplates:
-    - metadata:
+    - apiVersion: v1
+      kind: PersistentVolumeClaim
+      metadata:
         name: data
         {{- if .Values.readReplicas.persistence.annotations }}
         annotations: {{- include "common.tplvalues.render" (dict "value" .Values.readReplicas.persistence.annotations "context" $) | nindent 10 }}