diff --git a/stable/prometheus/templates/alertmanager-pvc.yaml b/stable/prometheus/templates/alertmanager-pvc.yaml
index 7012309b82..22c259a269 100644
--- a/stable/prometheus/templates/alertmanager-pvc.yaml
+++ b/stable/prometheus/templates/alertmanager-pvc.yaml
@@ -3,6 +3,11 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
+  {{- if .Values.alertmanager.persistentVolume.storageClass -}}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.alertmanager.persistentVolume.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: ''
+  {{- end }}
   {{- range $key, $value := .Values.alertmanager.persistentVolume.annotations }}
     {{ $key }}: {{ $value }}
   {{- end }}
diff --git a/stable/prometheus/templates/server-pvc.yaml b/stable/prometheus/templates/server-pvc.yaml
index 5a0325b970..ffaffb1deb 100644
--- a/stable/prometheus/templates/server-pvc.yaml
+++ b/stable/prometheus/templates/server-pvc.yaml
@@ -3,6 +3,11 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   annotations:
+  {{- if .Values.server.persistentVolume.storageClass -}}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: ''
+  {{- end }}
   {{- range $key, $value := .Values.server.persistentVolume.annotations }}
     {{ $key }}: {{ $value }}
   {{- end }}
diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml
index 85d9bd24a9..d2bb5f3d51 100644
--- a/stable/prometheus/values.yaml
+++ b/stable/prometheus/values.yaml
@@ -56,13 +56,16 @@ alertmanager:
 
     ## AlertManager data Persistent Volume annotations
     ##
-    annotations:
-      volume.beta.kubernetes.io/storage-class: standard
+    # annotations:
 
     ## AlertManager data Persistent Volume size
     ##
     size: 2Gi
 
+    ## AlertManager data Persistent Volume Storage Class
+    ##
+    # storageClass:
+
   ## Alertmanager resource requests and limits
   ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##
@@ -168,13 +171,16 @@ server:
 
     ## Server data Persistent Volume annotations
     ##
-    annotations:
-      volume.beta.kubernetes.io/storage-class: standard
+    # annotations:
 
     ## Server data Persistent Volume size
     ##
     size: 8Gi
 
+    ## AlertManager data Persistent Volume Storage Class
+    ##
+    # storageClass:
+
   ## Server resource requests and limits
   ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
   ##