diff --git a/charts/ibm-mqadvanced-server-dev/README.md b/charts/ibm-mqadvanced-server-dev/README.md
index e0c671d..52ffffc 100644
--- a/charts/ibm-mqadvanced-server-dev/README.md
+++ b/charts/ibm-mqadvanced-server-dev/README.md
@@ -50,8 +50,8 @@ The following table lists the configurable parameters of the `ibm-mqadvanced-ser
 | `image.pullPolicy`               | Image pull policy                               | `IfNotPresent`                                             |
 | `image.pullSecret`               | Image pull secret, if you are using a private Docker registry | `nil`                                        |
 | `persistence.enabled`       | Use a PersistentVolume to persist MQ data (under `/var/mqm`)  | `true`                                       |
-| `data.persistence.storageClass`  | Storage class of backing Persistent Volume                    | `nil`                                        |
-| `data.persistence.size`          | Size of data volume                             | `2Gi`                                                      |
+| `persistence.storageClass`  | Storage class of backing Persistent Volume                    | `nil`                                        |
+| `persistence.size`          | Size of data volume                             | `2Gi`                                                      |
 | `service.name`                   | Name of the Kubernetes service to create        | `qmgr`                                                     |
 | `service.type`                   | Kubernetes service type exposing ports, e.g. `NodePort`       | `ClusterIP`                                  |
 | `resources.limits.cpu`          | Kubernetes CPU limit for the Queue Manager container | `500m`                                                   |
diff --git a/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml b/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml
index 929a0a3..bf66475 100644
--- a/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml
+++ b/charts/ibm-mqadvanced-server-dev/templates/stateful-set.yaml
@@ -66,7 +66,7 @@ spec:
           {{- if .Values.persistence.enabled }}
           volumeMounts:
           - mountPath: "/mnt/mqm"
-            name: {{ template "fullname" . }}-{{ .Values.data.name }}
+            name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
           {{- end }}
           resources:
             limits:
@@ -76,18 +76,18 @@ spec:
   volumeClaimTemplates:
   {{- if .Values.persistence.enabled }}
   - metadata:
-      name: {{ template "fullname" . }}-{{ .Values.data.name }}
+      name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
       labels:
         app: {{ template "fullname" . }}
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         release: "{{ .Release.Name }}"
         heritage: "{{ .Release.Service }}"
     spec:
-      {{- if .Values.data.persistence.storageClassName }}
-      storageClassName: {{ .Values.data.persistence.storageClassName | quote }}
+      {{- if .Values.persistence.storageClassName }}
+      storageClassName: {{ .Values.persistence.storageClassName | quote }}
       {{- end }}
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: {{ .Values.data.persistence.size | quote }}
+          storage: {{ .Values.persistence.size | quote }}
   {{- end }}
diff --git a/charts/ibm-mqadvanced-server-dev/values.yaml b/charts/ibm-mqadvanced-server-dev/values.yaml
index ed9ed03..32cc774 100644
--- a/charts/ibm-mqadvanced-server-dev/values.yaml
+++ b/charts/ibm-mqadvanced-server-dev/values.yaml
@@ -26,13 +26,12 @@ image:
 # data section specifies settings for the main persistent volume claim, which is used for data in /var/mqm
 persistence:
   enabled: true
-data:
   # name sets part of the name for this persistent volume claim
   name: "data"
-    ## storageClassName is the name of the storage class to use, or an empty string for no storage class
-    storageClassName: ""
-    ## size is the minimum size of the persistent volume
-    size: 2Gi
+  ## storageClassName is the name of the storage class to use, or an empty string for no storage class
+  storageClassName: ""
+  ## size is the minimum size of the persistent volume
+  size: 2Gi
 service:
   name: qmgr
   type: ClusterIP
diff --git a/charts/ibm-mqadvanced-server-prod/README.md b/charts/ibm-mqadvanced-server-prod/README.md
index 13091e2..3b986e2 100644
--- a/charts/ibm-mqadvanced-server-prod/README.md
+++ b/charts/ibm-mqadvanced-server-prod/README.md
@@ -50,8 +50,8 @@ The following table lists the configurable parameters of the `ibm-mqadvanced-ser
 | `image.pullPolicy`              | Image pull policy                               | `IfNotPresent`                                             |
 | `image.pullSecret`              | Image pull secret, if you are using a private Docker registry | `nil`                                        |
 | `persistence.enabled`      | Use a PersistentVolume to persist MQ data (under `/var/mqm`)  | `true`                                       |
-| `data.persistence.storageClass` | Storage class of backing Persistent Volume      | `nil`                                                      |
-| `data.persistence.size`         | Size of data volume                             | `2Gi`                                                      |
+| `persistence.storageClass` | Storage class of backing Persistent Volume      | `nil`                                                      |
+| `persistence.size`         | Size of data volume                             | `2Gi`                                                      |
 | `service.name`                  | Name of the Kubernetes service to create        | `qmgr`                                                     |
 | `service.type`                  | Kubernetes service type exposing ports, e.g. `NodePort`       | `ClusterIP`                                  |
 | `resources.limits.cpu`          | Kubernetes CPU limit for the Queue Manager container | `1`                                                   |
diff --git a/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml b/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml
index 708a01a..fdd854e 100644
--- a/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml
+++ b/charts/ibm-mqadvanced-server-prod/templates/stateful-set.yaml
@@ -51,7 +51,7 @@ spec:
           {{- if .Values.persistence.enabled }}
           volumeMounts:
           - mountPath: "/mnt/mqm"
-            name: {{ template "fullname" . }}-{{ .Values.data.name }}
+            name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
           {{- end }}
           # Set liveness probe to determine if the queue manager is running
           livenessProbe:
@@ -79,18 +79,18 @@ spec:
   volumeClaimTemplates:
   {{- if .Values.persistence.enabled }}
   - metadata:
-      name: {{ template "fullname" . }}-{{ .Values.data.name }}
+      name: {{ template "fullname" . }}-{{ .Values.persistence.name }}
       labels:
         app: {{ template "fullname" . }}
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         release: "{{ .Release.Name }}"
         heritage: "{{ .Release.Service }}"
     spec:
-      {{- if .Values.data.persistence.storageClassName }}
-      storageClassName: {{ .Values.data.persistence.storageClassName | quote }}
+      {{- if .Values.persistence.storageClassName }}
+      storageClassName: {{ .Values.persistence.storageClassName | quote }}
       {{- end }}
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: {{ .Values.data.persistence.size | quote }}
+          storage: {{ .Values.persistence.size | quote }}
   {{- end }}
diff --git a/charts/ibm-mqadvanced-server-prod/values.yaml b/charts/ibm-mqadvanced-server-prod/values.yaml
index 54e89c0..7cf8b0c 100644
--- a/charts/ibm-mqadvanced-server-prod/values.yaml
+++ b/charts/ibm-mqadvanced-server-prod/values.yaml
@@ -23,18 +23,15 @@ image:
   pullSecret:
   # pullPolicy is either IfNotPresent or Always (https://kubernetes.io/docs/concepts/containers/images/)
   pullPolicy: IfNotPresent
-# data section specifies settings for the main persistent volume claim, which is used for data in /var/mqm
+# persistence section specifies settings for the main persistent volume claim, which is used for data in /var/mqm
 persistence:
   enabled: true
-data:
   # name sets part of the name for this persistent volume claim
   name: "data"
-  persistence:
-    enabled: true
-    ## storageClassName is the name of the storage class to use, or an empty string for no storage class
-    storageClassName: ""
-    ## size is the minimum size of the persistent volume
-    size: 2Gi
+  ## storageClassName is the name of the storage class to use, or an empty string for no storage class
+  storageClassName: ""
+  ## size is the minimum size of the persistent volume
+  size: 2Gi
 service:
   name: qmgr
   type: ClusterIP