diff --git a/charts/matrix/Chart.yaml b/charts/matrix/Chart.yaml
index db291a8c..893f258c 100644
--- a/charts/matrix/Chart.yaml
+++ b/charts/matrix/Chart.yaml
@@ -8,7 +8,7 @@ sources:
 
 type: application
 
-version: 19.5.0
+version: 19.5.1
 
 # renovate: image=ghcr.io/element-hq/synapse
 appVersion: v1.128.0
diff --git a/charts/matrix/templates/_helpers.tpl b/charts/matrix/templates/_helpers.tpl
index d37a1025..6db4e334 100644
--- a/charts/matrix/templates/_helpers.tpl
+++ b/charts/matrix/templates/_helpers.tpl
@@ -42,13 +42,12 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/name: "matrix"
 {{- end -}}
 
-# TODO: Include labels from values
 {{/*
 Synapse specific labels
 */}}
 {{- define "matrix.synapse.labels" -}}
-{{- range $key, $val := .Values.synapse.labels -}}
-{{ $key }}: {{ $val }}
+{{- with .Values.synapse.labels }}
+{{- toYaml . }}
 {{- end }}
 {{- end -}}
 
@@ -67,8 +66,8 @@ Create image name that is used in the deployment
 Element specific labels
 */}}
 {{- define "matrix.element.labels" -}}
-{{- range $key, $val := .Values.element.labels }}
-{{ $key }}: {{ $val }}
+{{- with .Values.element.labels }}
+{{- toYaml . }}
 {{- end }}
 {{- end -}}
 
@@ -76,8 +75,8 @@ Element specific labels
 Mail relay specific labels
 */}}
 {{- define "matrix.mail.labels" -}}
-{{- range $key, $val := .Values.mail.relay.labels -}}
-{{ $key }}: {{ $val }}
+{{- with .Values.mail.relay.labels }}
+{{- toYaml . }}
 {{- end }}
 {{- end -}}