diff --git a/changelog.d/3-bug-fixes/cannon-nginz-custom-tls b/changelog.d/3-bug-fixes/cannon-nginz-custom-tls
new file mode 100644
index 0000000000..8bd65abfe4
--- /dev/null
+++ b/changelog.d/3-bug-fixes/cannon-nginz-custom-tls
@@ -0,0 +1 @@
+Fix a bug in charts/cannon. It's now possible to use a custom TLS certificate when enabling cannon's nginz sidecar container. (Previously only letsencrypt certificates worked, and were tested)
diff --git a/charts/cannon/templates/nginz-certificate-secret.yaml b/charts/cannon/templates/nginz-certificate-secret.yaml
index 8394ebd8c0..05e552ce94 100644
--- a/charts/cannon/templates/nginz-certificate-secret.yaml
+++ b/charts/cannon/templates/nginz-certificate-secret.yaml
@@ -10,6 +10,6 @@ metadata:
     heritage: "{{ .Release.Service }}"
 type: kubernetes.io/tls
 data:
-  tls.crt: {{ .Values.secrets.nginz.tls.crt }}
-  tls.key: {{ .Values.secrets.nginz.tls.key }}
+  tls.crt: {{ .Values.secrets.nginz.tls.crt | b64enc | quote }}
+  tls.key: {{ .Values.secrets.nginz.tls.key | b64enc | quote }}
 {{- end }}