diff --git a/stable/gitlab-ee/Chart.yaml b/stable/gitlab-ee/Chart.yaml
index 3a9c2e881a9c..2f85fe2cb35b 100755
--- a/stable/gitlab-ee/Chart.yaml
+++ b/stable/gitlab-ee/Chart.yaml
@@ -1,6 +1,6 @@
 name: gitlab-ee
 deprecated: true
-version: 0.2.1
+version: 0.2.2
 description: GitLab Enterprise Edition
 keywords:
 - git
diff --git a/stable/gitlab-ee/templates/data-pvc.yaml b/stable/gitlab-ee/templates/data-pvc.yaml
index 9692402bbc43..a9c8c118fad0 100644
--- a/stable/gitlab-ee/templates/data-pvc.yaml
+++ b/stable/gitlab-ee/templates/data-pvc.yaml
@@ -3,16 +3,17 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "gitlab-ee.fullname" . }}-data
-  annotations:
-  {{- if .Values.persistence.gitlabData.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.gitlabData.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.gitlabData.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.gitlabData.size | quote }}
+{{- if .Values.persistence.gitlabData.storageClass }}
+{{- if (eq "-" .Values.persistence.gitlabData.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.gitlabData.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/stable/gitlab-ee/templates/etc-pvc.yaml b/stable/gitlab-ee/templates/etc-pvc.yaml
index bea67d1eb511..fdbe28a3307e 100644
--- a/stable/gitlab-ee/templates/etc-pvc.yaml
+++ b/stable/gitlab-ee/templates/etc-pvc.yaml
@@ -3,16 +3,17 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "gitlab-ee.fullname" . }}-etc
-  annotations:
-  {{- if .Values.persistence.gitlabEtc.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.gitlabEtc.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.gitlabEtc.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.gitlabEtc.size | quote }}
+{{- if .Values.persistence.gitlabEtc.storageClass }}
+{{- if (eq "-" .Values.persistence.gitlabEtc.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.gitlabEtc.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/stable/gitlab-ee/values.yaml b/stable/gitlab-ee/values.yaml
index 33c5aa37a191..9ef322d29c42 100644
--- a/stable/gitlab-ee/values.yaml
+++ b/stable/gitlab-ee/values.yaml
@@ -54,10 +54,14 @@ persistence:
   gitlabEtc:
     enabled: true
     size: 1Gi
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## gitlabEtc 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: "-"
     accessMode: ReadWriteOnce
   ## This volume is used to store git data and other project files.
   ## ref: https://docs.gitlab.com/omnibus/settings/configuration.html#storing-git-data-in-an-alternative-directory
@@ -65,10 +69,14 @@ persistence:
   gitlabData:
     enabled: true
     size: 10Gi
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## gitlabData 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: "-"
     accessMode: ReadWriteOnce
 
 ## Configuration values for the postgresql dependency.