diff --git a/stable/joomla/Chart.yaml b/stable/joomla/Chart.yaml
index ba8a9dbebc..5a2e685594 100644
--- a/stable/joomla/Chart.yaml
+++ b/stable/joomla/Chart.yaml
@@ -1,5 +1,5 @@
 name: joomla
-version: 0.4.15
+version: 0.4.16
 appVersion: 3.7.5
 description: PHP content management system (CMS) for publishing web content
 keywords:
diff --git a/stable/joomla/templates/apache-pvc.yaml b/stable/joomla/templates/apache-pvc.yaml
index 166feb8b9f..1ae6762ef2 100644
--- a/stable/joomla/templates/apache-pvc.yaml
+++ b/stable/joomla/templates/apache-pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.persistence.apache.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.apache.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.apache.size | quote }}
+{{- if .Values.persistence.apache.storageClass }}
+{{- if (eq "-" .Values.persistence.apache.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.apache.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end -}}
diff --git a/stable/joomla/templates/joomla-pvc.yaml b/stable/joomla/templates/joomla-pvc.yaml
index d6339ad8b3..069109e74b 100644
--- a/stable/joomla/templates/joomla-pvc.yaml
+++ b/stable/joomla/templates/joomla-pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.persistence.joomla.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.joomla.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.joomla.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.joomla.size | quote }}
+{{- if .Values.persistence.joomla.storageClass }}
+{{- if (eq "-" .Values.persistence.joomla.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.joomla.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end -}}
diff --git a/stable/joomla/values.yaml b/stable/joomla/values.yaml
index 69de7cfe15..8c70b3b07e 100644
--- a/stable/joomla/values.yaml
+++ b/stable/joomla/values.yaml
@@ -49,10 +49,14 @@ mariadb:
   ##
   persistence:
     enabled: true
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## mariadb 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
     size: 8Gi
 
@@ -67,17 +71,25 @@ serviceType: LoadBalancer
 persistence:
   enabled: true
   apache:
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## apache 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
     size: 1Gi
   joomla:
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## joomla 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
     size: 8Gi