diff --git a/stable/suitecrm/Chart.yaml b/stable/suitecrm/Chart.yaml
index 9b118251ff..43a8954edc 100644
--- a/stable/suitecrm/Chart.yaml
+++ b/stable/suitecrm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: suitecrm
-version: 5.3.1
+version: 5.3.2
 appVersion: 7.11.3
 description: SuiteCRM is a completely open source enterprise-grade Customer Relationship Management (CRM) application. SuiteCRM is a software fork of the popular customer relationship management (CRM) system SugarCRM.
 keywords:
diff --git a/stable/suitecrm/templates/_helpers.tpl b/stable/suitecrm/templates/_helpers.tpl
index 60c8bb179e..457a226fcb 100644
--- a/stable/suitecrm/templates/_helpers.tpl
+++ b/stable/suitecrm/templates/_helpers.tpl
@@ -15,6 +15,13 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "suitecrm.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/suitecrm/templates/deployment.yaml b/stable/suitecrm/templates/deployment.yaml
index deea2f961f..4f305f9152 100644
--- a/stable/suitecrm/templates/deployment.yaml
+++ b/stable/suitecrm/templates/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "suitecrm.fullname" . }}
   labels:
     app: {{ template "suitecrm.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ template "suitecrm.chart" . }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
diff --git a/stable/suitecrm/templates/externaldb-secrets.yaml b/stable/suitecrm/templates/externaldb-secrets.yaml
index 4ceb148898..8ae2d0b00f 100644
--- a/stable/suitecrm/templates/externaldb-secrets.yaml
+++ b/stable/suitecrm/templates/externaldb-secrets.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ printf "%s-%s" .Release.Name "externaldb"  }}
   labels:
     app: {{ printf "%s-%s" .Release.Name "externaldb"  }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ template "suitecrm.chart" . }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 type: Opaque
diff --git a/stable/suitecrm/templates/secrets.yaml b/stable/suitecrm/templates/secrets.yaml
index 58cbfb899f..52926d1063 100644
--- a/stable/suitecrm/templates/secrets.yaml
+++ b/stable/suitecrm/templates/secrets.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "suitecrm.fullname" . }}
   labels:
     app: {{ template "suitecrm.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ template "suitecrm.chart" . }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 type: Opaque
diff --git a/stable/suitecrm/templates/suitecrm-pvc.yaml b/stable/suitecrm/templates/suitecrm-pvc.yaml
index 18a7ac50e7..749515ffd4 100644
--- a/stable/suitecrm/templates/suitecrm-pvc.yaml
+++ b/stable/suitecrm/templates/suitecrm-pvc.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "suitecrm.fullname" . }}-suitecrm
   labels:
     app: {{ template "suitecrm.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ template "suitecrm.chart" . }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:
diff --git a/stable/suitecrm/templates/svc.yaml b/stable/suitecrm/templates/svc.yaml
index 3086e99f7f..d8488d2113 100644
--- a/stable/suitecrm/templates/svc.yaml
+++ b/stable/suitecrm/templates/svc.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ template "suitecrm.fullname" . }}
   labels:
     app: {{ template "suitecrm.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: "{{ template "suitecrm.chart" . }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec: