diff --git a/stable/osclass/Chart.yaml b/stable/osclass/Chart.yaml
index 0a8864fe2b..ad0bbde96d 100644
--- a/stable/osclass/Chart.yaml
+++ b/stable/osclass/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: osclass
-version: 6.0.1
+version: 6.1.0
 appVersion: 3.7.4
 description: Osclass is a php script that allows you to quickly create and manage
   your own free classifieds site.
diff --git a/stable/osclass/README.md b/stable/osclass/README.md
index 145f0baa49..d8e43d9450 100644
--- a/stable/osclass/README.md
+++ b/stable/osclass/README.md
@@ -51,6 +51,7 @@ The following table lists the configurable parameters of the Osclass chart and t
 |------------------------------------|------------------------------------------|-------------------------------------------------------- |
 | `global.imageRegistry`             | Global Docker image registry             | `nil`                                                   |
 | `global.imagePullSecrets`          | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
+| `global.storageClass`                     | Global storage class for dynamic provisioning                                               | `nil`                                                        |
 | `image.registry`                   | Osclass image registry                   | `docker.io`                                             |
 | `image.repository`                 | Osclass Image name                       | `bitnami/osclass`                                       |
 | `image.tag`                        | Osclass Image tag                        | `{TAG_NAME}`                                            |
diff --git a/stable/osclass/templates/_helpers.tpl b/stable/osclass/templates/_helpers.tpl
index acb751b7a5..35c0ef57cf 100644
--- a/stable/osclass/templates/_helpers.tpl
+++ b/stable/osclass/templates/_helpers.tpl
@@ -140,3 +140,23 @@ imagePullSecrets:
 {{- end }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return  the proper Storage Class
+*/}}
+{{- define "osclass.storageClass" -}}
+{{- $storageClass := "" }}
+{{- if .Values.persistence.osclass.storageClass -}}
+    {{- $storageClass = .Values.persistence.osclass.storageClass -}}
+{{- end -}}
+{{- if .Values.global -}}
+    {{- if .Values.global.storageClass -}}
+        {{- $storageClass = .Values.global.storageClass -}}
+    {{- end -}}
+{{- end -}}
+{{- if (eq "-" $storageClass) -}}
+    {{- printf "\"\"" -}}
+{{- else }}
+    {{- printf "%s" $storageClass -}}
+{{- end -}}
+{{- end -}}
diff --git a/stable/osclass/templates/osclass-pvc.yaml b/stable/osclass/templates/osclass-pvc.yaml
index 39fe2facc7..466c8d7d58 100644
--- a/stable/osclass/templates/osclass-pvc.yaml
+++ b/stable/osclass/templates/osclass-pvc.yaml
@@ -14,11 +14,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.osclass.size | quote }}
-{{- if .Values.persistence.osclass.storageClass }}
-{{- if (eq "-" .Values.persistence.osclass.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.osclass.storageClass }}"
-{{- end }}
-{{- end }}
+  storageClassName: {{ include "osclass.storageClass" . }}
 {{- end -}}
diff --git a/stable/osclass/values.yaml b/stable/osclass/values.yaml
index 1861872227..b50213e89c 100644
--- a/stable/osclass/values.yaml
+++ b/stable/osclass/values.yaml
@@ -6,6 +6,7 @@
 #   imageRegistry: myRegistryName
 #   imagePullSecrets:
 #     - myRegistryKeySecretName
+#   storageClass: myStorageClass
 
 ## Bitnami Osclass image version
 ## ref: https://hub.docker.com/r/bitnami/osclass/tags/