diff --git a/incubator/cassandra/Chart.yaml b/incubator/cassandra/Chart.yaml
index 0835d9ebc9..0c79788626 100644
--- a/incubator/cassandra/Chart.yaml
+++ b/incubator/cassandra/Chart.yaml
@@ -1,5 +1,5 @@
 name: cassandra
-version: 0.1.3
+version: 0.1.4
 description: Apache Cassandra is a free and open-source distributed database management
   system designed to handle large amounts of data across many commodity servers, providing
   high availability with no single point of failure.
diff --git a/incubator/cassandra/templates/cassandra-statefulset.yaml b/incubator/cassandra/templates/cassandra-statefulset.yaml
index 5110a233e3..c646cadbed 100644
--- a/incubator/cassandra/templates/cassandra-statefulset.yaml
+++ b/incubator/cassandra/templates/cassandra-statefulset.yaml
@@ -113,16 +113,17 @@ spec:
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         release: "{{ .Release.Name }}"
         heritage: "{{ .Release.Service }}"
-      annotations:
-      {{- if .Values.persistence.storageClass }}
-        volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
-      {{- else }}
-        volume.alpha.kubernetes.io/storage-class: default
-      {{- end }}
     spec:
       accessModes:
         - {{ .Values.persistence.accessMode | quote }}
       resources:
         requests:
           storage: {{ .Values.persistence.size | quote }}
+    {{- if .Values.persistence.storageClass }}
+    {{- if (eq "-" .Values.persistence.storageClass) }}
+      storageClassName: ""
+    {{- else }}
+      storageClassName: "{{ .Values.persistence.storageClass }}"
+    {{- end }}
+    {{- end }}
 {{- end }}
diff --git a/incubator/cassandra/values.yaml b/incubator/cassandra/values.yaml
index 42c88bea7d..86ecdadcb8 100644
--- a/incubator/cassandra/values.yaml
+++ b/incubator/cassandra/values.yaml
@@ -13,9 +13,14 @@ service:
 ## Persist data to a persitent volume
 persistence:
   enabled: true
-  ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-  ## Default: volume.alpha.kubernetes.io/storage-class: default
-  #  storageClass: generic
+  ## cassandra data Persistent Volume Storage Class
+  ## If defined, storageClassName: <storageClass>
+  ## 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: "-"
   accessMode: ReadWriteOnce
   size: 10Gi
 
@@ -55,4 +60,4 @@ config:
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
 # selector:
   # nodeSelector:
-    # cloud.google.com/gke-nodepool: pool-db
\ No newline at end of file
+    # cloud.google.com/gke-nodepool: pool-db