diff --git a/stable/opencart/Chart.yaml b/stable/opencart/Chart.yaml
index 12e686f25a..b77d1a308f 100644
--- a/stable/opencart/Chart.yaml
+++ b/stable/opencart/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: opencart
-version: 6.0.0
+version: 6.0.1
 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/templates/_helpers.tpl b/stable/opencart/templates/_helpers.tpl
index b52bffbceb..dfafdbdc4e 100644
--- a/stable/opencart/templates/_helpers.tpl
+++ b/stable/opencart/templates/_helpers.tpl
@@ -23,6 +23,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 {{- end -}}
 
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "opencart.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
diff --git a/stable/opencart/templates/deployment.yaml b/stable/opencart/templates/deployment.yaml
index 8b58883d76..9969088c67 100644
--- a/stable/opencart/templates/deployment.yaml
+++ b/stable/opencart/templates/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "opencart.fullname" . }}
   labels:
     app: {{ template "opencart.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "opencart.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
@@ -17,7 +17,7 @@ spec:
     metadata:
       labels:
         app: {{ template "opencart.fullname" . }}
-        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        chart: {{ template "opencart.chart" . }}
         release: "{{ .Release.Name }}"
 {{- if or .Values.podAnnotations .Values.metrics.enabled }}
       annotations:
diff --git a/stable/opencart/templates/externaldb-secrets.yaml b/stable/opencart/templates/externaldb-secrets.yaml
index 4ceb148898..357fcdc4fd 100644
--- a/stable/opencart/templates/externaldb-secrets.yaml
+++ b/stable/opencart/templates/externaldb-secrets.yaml
@@ -5,10 +5,10 @@ metadata:
   name: {{ printf "%s-%s" .Release.Name "externaldb"  }}
   labels:
     app: {{ printf "%s-%s" .Release.Name "externaldb"  }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "opencart.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 type: Opaque
 data:
   db-password: {{ default "" .Values.externalDatabase.password | b64enc | quote }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/opencart/templates/opencart-pvc.yaml b/stable/opencart/templates/opencart-pvc.yaml
index 351097b062..99e9cd540f 100644
--- a/stable/opencart/templates/opencart-pvc.yaml
+++ b/stable/opencart/templates/opencart-pvc.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "opencart.fullname" . }}-opencart
   labels:
     app: {{ template "opencart.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "opencart.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
diff --git a/stable/opencart/templates/secrets.yaml b/stable/opencart/templates/secrets.yaml
index 63346020cb..19282b633e 100644
--- a/stable/opencart/templates/secrets.yaml
+++ b/stable/opencart/templates/secrets.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "opencart.fullname" . }}
   labels:
     app: {{ template "opencart.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "opencart.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 type: Opaque
diff --git a/stable/opencart/templates/svc.yaml b/stable/opencart/templates/svc.yaml
index 53d0162478..836a1b545f 100644
--- a/stable/opencart/templates/svc.yaml
+++ b/stable/opencart/templates/svc.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "opencart.fullname" . }}
   labels:
     app: {{ template "opencart.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "opencart.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec: