diff --git a/stable/openvpn/Chart.yaml b/stable/openvpn/Chart.yaml
index 644770bcd1..d98219eb5d 100755
--- a/stable/openvpn/Chart.yaml
+++ b/stable/openvpn/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to install an openvpn server inside a kubernetes cluster.  Certificate generation is also part of the deployment, and this chart will generate client keys as needed.
 name: openvpn
-version: 1.1.1
+version: 1.1.2
 maintainers:
   - name: John Felten
     email: john.felten@gmail.com
diff --git a/stable/openvpn/templates/certs-pvc.yaml b/stable/openvpn/templates/certs-pvc.yaml
index edec7b7134..049f0b3b37 100644
--- a/stable/openvpn/templates/certs-pvc.yaml
+++ b/stable/openvpn/templates/certs-pvc.yaml
@@ -10,16 +10,17 @@ metadata:
     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/stable/openvpn/values.yaml b/stable/openvpn/values.yaml
index aace956fd0..414f908d9f 100644
--- a/stable/openvpn/values.yaml
+++ b/stable/openvpn/values.yaml
@@ -20,7 +20,14 @@ resources:
     memory: 128Mi
 persistence:
   enabled: true
-  #StorageClass: generic
+  ## openvpn 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: 2M
 openvpn: