diff --git a/stable/phpbb/Chart.yaml b/stable/phpbb/Chart.yaml
index d5c02c8461..d9358e0370 100644
--- a/stable/phpbb/Chart.yaml
+++ b/stable/phpbb/Chart.yaml
@@ -1,5 +1,5 @@
 name: phpbb
-version: 0.4.15
+version: 0.4.16
 appVersion: 3.2.1
 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more.
 keywords:
diff --git a/stable/phpbb/templates/apache-pvc.yaml b/stable/phpbb/templates/apache-pvc.yaml
index 166feb8b9f..1ae6762ef2 100644
--- a/stable/phpbb/templates/apache-pvc.yaml
+++ b/stable/phpbb/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/phpbb/templates/phpbb-pvc.yaml b/stable/phpbb/templates/phpbb-pvc.yaml
index 6715d5c7f0..9f217fe668 100644
--- a/stable/phpbb/templates/phpbb-pvc.yaml
+++ b/stable/phpbb/templates/phpbb-pvc.yaml
@@ -8,16 +8,17 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
-  annotations:
-  {{- if .Values.persistence.phpbb.storageClass }}
-    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.phpbb.storageClass | quote }}
-  {{- else }}
-    volume.alpha.kubernetes.io/storage-class: default
-  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.phpbb.accessMode | quote }}
   resources:
     requests:
       storage: {{ .Values.persistence.phpbb.size | quote }}
+{{- if .Values.persistence.phpbb.storageClass }}
+{{- if (eq "-" .Values.persistence.phpbb.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.persistence.phpbb.storageClass }}"
+{{- end }}
+{{- end }}
 {{- end -}}
diff --git a/stable/phpbb/values.yaml b/stable/phpbb/values.yaml
index ef30623a53..ab378371db 100644
--- a/stable/phpbb/values.yaml
+++ b/stable/phpbb/values.yaml
@@ -46,10 +46,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
 
@@ -64,17 +68,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
   phpbb:
-    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
-    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ## phpbb 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