diff --git a/charts/opensearch/ci/ci-ingress-class-name-values.yaml b/charts/opensearch/ci/ci-ingress-class-name-values.yaml
index c02e2756..6d696075 100644
--- a/charts/opensearch/ci/ci-ingress-class-name-values.yaml
+++ b/charts/opensearch/ci/ci-ingress-class-name-values.yaml
@@ -195,13 +195,13 @@ persistence:
     # Add default labels for the volumeClaimTemplate of the StatefulSet
     enabled: false
   # OpenSearch Persistent Volume Storage Class
-  # If defined, storageClassName: <storageClass>
+  # If defined, storageClassName: <storageClassName>
   # If set to "-", storageClassName: "", which disables dynamic provisioning
   # If undefined (the default) or set to null, no storageClassName spec is
   #   set, choosing the default provisioner.  (gp2 on AWS, standard on
   #   GKE, AWS & OpenStack)
   #
-  # storageClass: "-"
+  # storageClassName: "-"
   accessModes:
     - ReadWriteOnce
   size: 8Gi
diff --git a/charts/opensearch/ci/ci-rbac-enabled-values.yaml b/charts/opensearch/ci/ci-rbac-enabled-values.yaml
index b2463d55..a2f0bde5 100755
--- a/charts/opensearch/ci/ci-rbac-enabled-values.yaml
+++ b/charts/opensearch/ci/ci-rbac-enabled-values.yaml
@@ -195,13 +195,13 @@ persistence:
     # Add default labels for the volumeClaimTemplate of the StatefulSet
     enabled: false
   # OpenSearch Persistent Volume Storage Class
-  # If defined, storageClassName: <storageClass>
+  # If defined, storageClassName: <storageClassName>
   # If set to "-", storageClassName: "", which disables dynamic provisioning
   # If undefined (the default) or set to null, no storageClassName spec is
   #   set, choosing the default provisioner.  (gp2 on AWS, standard on
   #   GKE, AWS & OpenStack)
   #
-  # storageClass: "-"
+  # storageClassName: "-"
   accessModes:
     - ReadWriteOnce
   size: 8Gi
diff --git a/charts/opensearch/ci/ci-values.yaml b/charts/opensearch/ci/ci-values.yaml
index fbd24cc8..d7b047cc 100755
--- a/charts/opensearch/ci/ci-values.yaml
+++ b/charts/opensearch/ci/ci-values.yaml
@@ -196,13 +196,13 @@ persistence:
     # Add default labels for the volumeClaimTemplate of the StatefulSet
     enabled: false
   # OpenSearch Persistent Volume Storage Class
-  # If defined, storageClassName: <storageClass>
+  # If defined, storageClassName: <storageClassName>
   # If set to "-", storageClassName: "", which disables dynamic provisioning
   # If undefined (the default) or set to null, no storageClassName spec is
   #   set, choosing the default provisioner.  (gp2 on AWS, standard on
   #   GKE, AWS & OpenStack)
   #
-  # storageClass: "-"
+  # storageClassName: "-"
   accessModes:
     - ReadWriteOnce
   size: 8Gi
diff --git a/charts/opensearch/templates/statefulset.yaml b/charts/opensearch/templates/statefulset.yaml
index 72e14976..71a012f8 100644
--- a/charts/opensearch/templates/statefulset.yaml
+++ b/charts/opensearch/templates/statefulset.yaml
@@ -43,11 +43,11 @@ spec:
       resources:
         requests:
           storage: {{ .Values.persistence.size | quote }}
-    {{- if .Values.persistence.storageClass }}
-    {{- if (eq "-" .Values.persistence.storageClass) }}
+    {{- if .Values.persistence.storageClassName }}
+    {{- if (eq "-" .Values.persistence.storageClassName) }}
       storageClassName: ""
     {{- else }}
-      storageClassName: "{{ .Values.persistence.storageClass }}"
+      storageClassName: "{{ .Values.persistence.storageClassName }}"
     {{- end }}
     {{- end }}
   {{- end }}
diff --git a/charts/opensearch/values.yaml b/charts/opensearch/values.yaml
index 33737661..4ee53043 100644
--- a/charts/opensearch/values.yaml
+++ b/charts/opensearch/values.yaml
@@ -206,13 +206,13 @@ persistence:
     # Add default labels for the volumeClaimTemplate of the StatefulSet
     enabled: false
   # OpenSearch Persistent Volume Storage Class
-  # If defined, storageClassName: <storageClass>
+  # If defined, storageClassName: <storageClassName>
   # If set to "-", storageClassName: "", which disables dynamic provisioning
   # If undefined (the default) or set to null, no storageClassName spec is
   #   set, choosing the default provisioner.  (gp2 on AWS, standard on
   #   GKE, AWS & OpenStack)
   #
-  # storageClass: "-"
+  # storageClassName: "-"
   accessModes:
     - ReadWriteOnce
   size: 8Gi