diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
index 7e205a691f..91a81e3ec0 100644
--- a/stable/artifactory/Chart.yaml
+++ b/stable/artifactory/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory
 home: https://www.jfrog.com/artifactory/
-version: 5.4.6-2
+version: 5.4.6-3
 appVersion: 5.4.6
 description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
 keywords:
diff --git a/stable/artifactory/templates/artifactory-pvc.yaml b/stable/artifactory/templates/artifactory-pvc.yaml
index 0b475eeadd..2d97aca281 100755
--- a/stable/artifactory/templates/artifactory-pvc.yaml
+++ b/stable/artifactory/templates/artifactory-pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.artifactory.persistence.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.artifactory.persistence.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.artifactory.persistence.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.artifactory.persistence.size | quote }}
-{{- end }}
\ No newline at end of file
+{{- if .Values.artifactory.persistence.storageClass }}
+{{- if (eq "-" .Values.artifactory.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.artifactory.persistence.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/stable/artifactory/templates/nginx-pvc.yaml b/stable/artifactory/templates/nginx-pvc.yaml
index 7c499120ff..dd34f5fb7f 100755
--- a/stable/artifactory/templates/nginx-pvc.yaml
+++ b/stable/artifactory/templates/nginx-pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.nginx.persistence.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.nginx.persistence.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.nginx.persistence.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.nginx.persistence.size | quote }}
-{{- end }}
\ No newline at end of file
+{{- if .Values.nginx.persistence.storageClass }}
+{{- if (eq "-" .Values.nginx.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.nginx.persistence.storageClass }}"
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/stable/artifactory/templates/postgresql-pvc.yaml b/stable/artifactory/templates/postgresql-pvc.yaml
index 2fc90cc7c3..96cddcd5bd 100755
--- a/stable/artifactory/templates/postgresql-pvc.yaml
+++ b/stable/artifactory/templates/postgresql-pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.database.persistence.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.database.persistence.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.database.persistence.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.database.persistence.size | quote }}
+{{- if .Values.database.persistence.storageClass }}
+{{- if (eq "-" .Values.database.persistence.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.database.persistence.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end }}
diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
index c7dab381f5..c963350d85 100644
--- a/stable/artifactory/values.yaml
+++ b/stable/artifactory/values.yaml
@@ -29,6 +29,14 @@ database:
     enabled: true
     accessMode: ReadWriteOnce
     size: 10Gi
+    ## database 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: "-"
 
 # Artifactory
 artifactory:
@@ -48,6 +56,14 @@ artifactory:
     enabled: true
     accessMode: ReadWriteOnce
     size: 20Gi
+    ## artifactory 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: "-"
 
 # Nginx
 nginx:
@@ -72,3 +88,11 @@ nginx:
     enabled: true
     accessMode: ReadWriteOnce
     size: 5Gi
+    ## nginx 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: "-"