diff --git a/stable/phpbb/Chart.yaml b/stable/phpbb/Chart.yaml
index 28c1dd144a..433a368e3c 100644
--- a/stable/phpbb/Chart.yaml
+++ b/stable/phpbb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: phpbb
-version: 6.1.1
+version: 6.1.2
 appVersion: 3.2.7
 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/_helpers.tpl b/stable/phpbb/templates/_helpers.tpl
index 92a6a6d06a..ffbba2c345 100644
--- a/stable/phpbb/templates/_helpers.tpl
+++ b/stable/phpbb/templates/_helpers.tpl
@@ -130,25 +130,25 @@ but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else
 {{- if .Values.global -}}
     {{- if .Values.global.storageClass -}}
         {{- if (eq "-" .Values.global.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
         {{- else }}
-            {{- printf "%s" .Values.global.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.global.storageClass -}}
         {{- end -}}
     {{- else -}}
         {{- if .Values.persistence.phpbb.storageClass -}}
               {{- if (eq "-" .Values.persistence.phpbb.storageClass) -}}
-                  {{- printf "\"\"" -}}
+                  {{- printf "storageClassName: \"\"" -}}
               {{- else }}
-                  {{- printf "%s" .Values.persistence.phpbb.storageClass -}}
+                  {{- printf "storageClassName: %s" .Values.persistence.phpbb.storageClass -}}
               {{- end -}}
         {{- end -}}
     {{- end -}}
 {{- else -}}
     {{- if .Values.persistence.phpbb.storageClass -}}
         {{- if (eq "-" .Values.persistence.phpbb.storageClass) -}}
-            {{- printf "\"\"" -}}
+            {{- printf "storageClassName: \"\"" -}}
         {{- else }}
-            {{- printf "%s" .Values.persistence.phpbb.storageClass -}}
+            {{- printf "storageClassName: %s" .Values.persistence.phpbb.storageClass -}}
         {{- end -}}
     {{- end -}}
 {{- end -}}
diff --git a/stable/phpbb/templates/phpbb-pvc.yaml b/stable/phpbb/templates/phpbb-pvc.yaml
index 9379cf1ba6..0edb6c16b6 100644
--- a/stable/phpbb/templates/phpbb-pvc.yaml
+++ b/stable/phpbb/templates/phpbb-pvc.yaml
@@ -14,5 +14,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.phpbb.size | quote }}
-  storageClassName: {{ include "phpbb.storageClass" . }}
+  {{ include "phpbb.storageClass" . }}
 {{- end -}}