diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml
index f7e8611c2bb1..b277ca67d3fe 100755
--- a/stable/grafana/Chart.yaml
+++ b/stable/grafana/Chart.yaml
@@ -1,5 +1,5 @@
 name: grafana
-version: 0.4.4
+version: 0.4.5
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.net
 icon: https://raw.githubusercontent.com/grafana/grafana/master/public/img/logo_transparent_400x.png
diff --git a/stable/grafana/templates/pvc.yaml b/stable/grafana/templates/pvc.yaml
index e510f7d8d48a..4c05a3f862bc 100644
--- a/stable/grafana/templates/pvc.yaml
+++ b/stable/grafana/templates/pvc.yaml
@@ -4,11 +4,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
-  {{- if .Values.server.persistentVolume.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
   {{- if .Values.server.persistentVolume.annotations }}
 {{ toYaml .Values.server.persistentVolume.annotations | indent 4 }}
   {{- end }}
@@ -27,5 +22,12 @@ spec:
   resources:
     requests:
       storage: {{ .Values.server.persistentVolume.size | quote }}
+{{- if .Values.server.persistentVolume.storageClass }}
+{{- if (eq "-" .Values.server.persistentVolume.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.server.persistentVolume.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end -}}
 {{- end -}}
diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml
index 64bf0e73c016..b908a0d2f4c3 100644
--- a/stable/grafana/values.yaml
+++ b/stable/grafana/values.yaml
@@ -77,11 +77,14 @@ server:
     ##
     size: 1Gi
 
-    ## Data Persistent Volume Storage Class
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## grafana 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:
+    # storageClass: "-"
 
     ## Subdirectory of data Persistent Volume to mount
     ## Useful if the volume's root directory is not empty