diff --git a/stable/opencart/Chart.yaml b/stable/opencart/Chart.yaml
index 06577382be..d4977bd294 100644
--- a/stable/opencart/Chart.yaml
+++ b/stable/opencart/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: opencart
-version: 6.0.2
+version: 6.1.0
 appVersion: 3.0.3-2
 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store.
 keywords:
diff --git a/stable/opencart/README.md b/stable/opencart/README.md
index fbc027401d..1734e87de6 100644
--- a/stable/opencart/README.md
+++ b/stable/opencart/README.md
@@ -51,6 +51,7 @@ The following table lists the configurable parameters of the OpenCart chart and
 |-------------------------------------|-------------------------------------------|----------------------------------------------------------|
 | `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`                    | OpenCart image registry                   | `docker.io`                                              |
 | `image.repository`                  | OpenCart Image name                       | `bitnami/opencart`                                       |
 | `image.tag`                         | OpenCart Image tag                        | `{TAG_NAME}`                                             |
diff --git a/stable/opencart/templates/_helpers.tpl b/stable/opencart/templates/_helpers.tpl
index dfafdbdc4e..29d60095b1 100644
--- a/stable/opencart/templates/_helpers.tpl
+++ b/stable/opencart/templates/_helpers.tpl
@@ -139,3 +139,24 @@ imagePullSecrets:
 {{- end }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return  the proper Storage Class
+*/}}
+{{- define "opencart.storageClass" -}}
+{{- $storageClass := "" }}
+{{- if .Values.global -}}
+    {{- if .Values.global.storageClass -}}
+        {{- $storageClass = .Values.global.storageClass -}}
+    {{- else if .Values.persistence.opencart.storageClass -}}
+        {{- $storageClass = .Values.persistence.opencart.storageClass -}}
+    {{- end -}}
+{{- else if .Values.persistence.opencart.storageClass -}}
+    {{- $storageClass = .Values.persistence.opencart.storageClass -}}
+{{- end -}}
+{{- if (eq "-" $storageClass) -}}
+    {{- printf "\"\"" -}}
+{{- else }}
+    {{- printf "%s" $storageClass -}}
+{{- end -}}
+{{- end -}}
diff --git a/stable/opencart/templates/opencart-pvc.yaml b/stable/opencart/templates/opencart-pvc.yaml
index 99e9cd540f..274c4796ef 100644
--- a/stable/opencart/templates/opencart-pvc.yaml
+++ b/stable/opencart/templates/opencart-pvc.yaml
@@ -14,11 +14,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.persistence.opencart.size | quote }}
-{{- if .Values.persistence.opencart.storageClass }}
-{{- if (eq "-" .Values.persistence.opencart.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.opencart.storageClass }}"
-{{- end }}
-{{- end }}
+  storageClassName: {{ include "opencart.storageClass" . }}
 {{- end -}}
diff --git a/stable/opencart/values.yaml b/stable/opencart/values.yaml
index 7bc88d6b82..716a704d9d 100644
--- a/stable/opencart/values.yaml
+++ b/stable/opencart/values.yaml
@@ -6,6 +6,7 @@
 #   imageRegistry: myRegistryName
 #   imagePullSecrets:
 #     - myRegistryKeySecretName
+#   storageClass: myStorageClass
 
 ## Bitnami OpenCart image version
 ## ref: https://hub.docker.com/r/bitnami/opencart/tags/