diff --git a/src/main/charts/bamboo/templates/_helpers.tpl b/src/main/charts/bamboo/templates/_helpers.tpl
index 2cafd7c32..33b9529ff 100644
--- a/src/main/charts/bamboo/templates/_helpers.tpl
+++ b/src/main/charts/bamboo/templates/_helpers.tpl
@@ -366,7 +366,9 @@ persistentVolumeClaimRetentionPolicy:
 {{- end}}
 volumeClaimTemplates:
 {{- if .Values.volumes.localHome.persistentVolumeClaim.create }}
-- metadata:
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
     name: local-home
   spec:
     accessModes: [ "ReadWriteOnce" ]
diff --git a/src/main/charts/bitbucket/templates/_helpers.tpl b/src/main/charts/bitbucket/templates/_helpers.tpl
index 611d83cc6..da95d3983 100644
--- a/src/main/charts/bitbucket/templates/_helpers.tpl
+++ b/src/main/charts/bitbucket/templates/_helpers.tpl
@@ -375,7 +375,9 @@ persistentVolumeClaimRetentionPolicy:
 {{- end}}
 volumeClaimTemplates:
 {{- if .Values.volumes.localHome.persistentVolumeClaim.create }}
-- metadata:
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
     name: local-home
   spec:
     accessModes: [ "ReadWriteOnce" ]
diff --git a/src/main/charts/confluence/templates/_helpers.tpl b/src/main/charts/confluence/templates/_helpers.tpl
index 8a7aed5db..7124aae72 100644
--- a/src/main/charts/confluence/templates/_helpers.tpl
+++ b/src/main/charts/confluence/templates/_helpers.tpl
@@ -569,7 +569,9 @@ persistentVolumeClaimRetentionPolicy:
 {{- end}}
 volumeClaimTemplates:
 {{- if .Values.volumes.localHome.persistentVolumeClaim.create }}
-- metadata:
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
     name: local-home
   spec:
     accessModes: [ "ReadWriteOnce" ]
@@ -605,7 +607,9 @@ persistentVolumeClaimRetentionPolicy:
     whenScaled: {{.Values.volumes.synchronyHome.persistentVolumeClaimRetentionPolicy.whenScaled}}
 {{- end}}
 volumeClaimTemplates:
-- metadata:
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
     name: synchrony-home
   spec:
     accessModes: [ "ReadWriteOnce" ]
diff --git a/src/main/charts/crowd/templates/_helpers.tpl b/src/main/charts/crowd/templates/_helpers.tpl
index e5437050f..10f98d061 100644
--- a/src/main/charts/crowd/templates/_helpers.tpl
+++ b/src/main/charts/crowd/templates/_helpers.tpl
@@ -317,7 +317,9 @@ persistentVolumeClaimRetentionPolicy:
 {{- end}}
 volumeClaimTemplates:
 {{- if .Values.volumes.localHome.persistentVolumeClaim.create }}
-- metadata:
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
     name: local-home
   spec:
     accessModes: [ "ReadWriteOnce" ]
diff --git a/src/main/charts/jira/templates/_helpers.tpl b/src/main/charts/jira/templates/_helpers.tpl
index 43fb33b38..4f9cc1b20 100644
--- a/src/main/charts/jira/templates/_helpers.tpl
+++ b/src/main/charts/jira/templates/_helpers.tpl
@@ -413,7 +413,9 @@ persistentVolumeClaimRetentionPolicy:
 {{- end}}
 volumeClaimTemplates:
 {{- if .Values.volumes.localHome.persistentVolumeClaim.create }}
-- metadata:
+- apiVersion: v1
+  kind: PersistentVolumeClaim
+  metadata:
     name: local-home
   spec:
     accessModes: [ "ReadWriteOnce" ]
diff --git a/src/test/resources/expected_helm_output/bamboo-agent/output.yaml b/src/test/resources/expected_helm_output/bamboo-agent/output.yaml
index b26b7f5d2..e30eb2a6e 100644
--- a/src/test/resources/expected_helm_output/bamboo-agent/output.yaml
+++ b/src/test/resources/expected_helm_output/bamboo-agent/output.yaml
@@ -46,7 +46,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: 9a98b41a1da066f40ae9f4aa3287ac9be4e429b95c274256f832460a9d8712a3
+        checksum/config-jvm: e6302b5d728be9cb0332d747ef6e6d9ef2b7dc400065102fdb4d9759e6b58b57
       labels:
         app.kubernetes.io/name: bamboo-agent
         app.kubernetes.io/instance: unittest-bamboo-agent
diff --git a/src/test/resources/expected_helm_output/bamboo/output.yaml b/src/test/resources/expected_helm_output/bamboo/output.yaml
index 25aef5c9a..18fd9ae28 100644
--- a/src/test/resources/expected_helm_output/bamboo/output.yaml
+++ b/src/test/resources/expected_helm_output/bamboo/output.yaml
@@ -457,7 +457,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: b705db3ed9b91938a23d626ca0f8725fb47af5bce6eb9848f586a5d4239d1a21
+        checksum/config-jvm: d39ffe576460a5be8eaa579df4e744d7fca12e30af7579f63412fcf3bd4f4dd8
       labels:
         helm.sh/chart: bamboo-2.0.5
         app.kubernetes.io/name: bamboo
diff --git a/src/test/resources/expected_helm_output/bitbucket/output.yaml b/src/test/resources/expected_helm_output/bitbucket/output.yaml
index d7efa33d2..e1934f032 100644
--- a/src/test/resources/expected_helm_output/bitbucket/output.yaml
+++ b/src/test/resources/expected_helm_output/bitbucket/output.yaml
@@ -603,7 +603,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: 71d151ebb77271e9b0c87e6631fe898e564007ab8af1144f123f9d2451e36a37
+        checksum/config-jvm: cb9e5fb87fcd54e34c0f4e3b8c6d172bc0613964ef4289bdb3ebfdffe3510931
       labels:
         app.kubernetes.io/name: bitbucket-mesh
         app.kubernetes.io/instance: unittest-bitbucket
@@ -724,7 +724,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: f1af62bc806ba61471ce90cb05884979038428faa1576feb4fabc574325d4558
+        checksum/config-jvm: 6526e9d5f767c7c61f1c789fc0582d8e3e46c6d8858e781dc5be5030c0159fdf
       labels:
         helm.sh/chart: bitbucket-2.0.5
         app.kubernetes.io/name: bitbucket
diff --git a/src/test/resources/expected_helm_output/confluence/output.yaml b/src/test/resources/expected_helm_output/confluence/output.yaml
index 51e585182..eb40a716e 100644
--- a/src/test/resources/expected_helm_output/confluence/output.yaml
+++ b/src/test/resources/expected_helm_output/confluence/output.yaml
@@ -668,7 +668,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: 139f1cdd4101022a790de67975f105114f4fcc91b3039e5398592805123683d6
+        checksum/config-jvm: 04ff0c84ab05c7df598092cab4e3ed532c63c7ebdd6d6fa282db5cd050b64b49
       labels:
         helm.sh/chart: confluence-2.0.5
         app.kubernetes.io/name: confluence
diff --git a/src/test/resources/expected_helm_output/crowd/output.yaml b/src/test/resources/expected_helm_output/crowd/output.yaml
index 97a084678..f917e4613 100644
--- a/src/test/resources/expected_helm_output/crowd/output.yaml
+++ b/src/test/resources/expected_helm_output/crowd/output.yaml
@@ -381,7 +381,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: 33b34c7dd5ed27e06a9c221da42805aeee39f7d9273f328833e104889586d433
+        checksum/config-jvm: 497118b00b16287b7740f0f2bea19d09ff7aac932a47557021c98924575aef7e
       labels:
         helm.sh/chart: crowd-2.0.5
         app.kubernetes.io/name: crowd
diff --git a/src/test/resources/expected_helm_output/jira/output.yaml b/src/test/resources/expected_helm_output/jira/output.yaml
index 8f72cb0b0..c7a25ca1d 100644
--- a/src/test/resources/expected_helm_output/jira/output.yaml
+++ b/src/test/resources/expected_helm_output/jira/output.yaml
@@ -424,7 +424,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config-jvm: 90dd7238442df6e5cd750fa929a1675353a9cf2d428dc0d782fc47b5c88b0128
+        checksum/config-jvm: 61db5d5c09601f3ab3a4a0800172be644e3ba0de0d23a6aa933bb7b743a48e39
       labels:
         helm.sh/chart: jira-2.0.5
         app.kubernetes.io/name: jira