diff --git a/templates/synapse/_homeserver.yaml b/templates/synapse/_homeserver.yaml
index 876337e..15272c9 100644
--- a/templates/synapse/_homeserver.yaml
+++ b/templates/synapse/_homeserver.yaml
@@ -832,7 +832,7 @@ url_preview_ip_range_whitelist:
 
 {{- if .Values.matrix.urlPreviews.rules.url.blacklist }}
 url_preview_url_blacklist:
-{{ include .Values.matrix.urlPreviews.rules.url.blacklist . | nindent 2 }}
+{{ toYaml .Values.matrix.urlPreviews.rules.url.blacklist | nindent 2 }}
 {{- end }}
 
 # The largest allowed URL preview spidering size in bytes
@@ -1820,7 +1820,7 @@ password_config:
 email:
   enable_notifs: {{ .Values.mail.enabled }}
   notif_from: {{ .Values.mail.from }}
-  {{- if .Values.mail.relay.enabled }}
+  {{- if eq .Values.mail.relay.enabled true }}
   smtp_host: {{ include "matrix.fullname" . }}-exim-relay
   smtp_port: {{ .Values.mail.relay.service.port }}
   {{- else }}
diff --git a/templates/synapse/configmap.yaml b/templates/synapse/configmap.yaml
index 5a64f23..edbfd3c 100644
--- a/templates/synapse/configmap.yaml
+++ b/templates/synapse/configmap.yaml
@@ -8,7 +8,7 @@ metadata:
 data:
   homeserver.yaml: |
     {{ include "homeserver.yaml" . | nindent 4 }}
-  {{ .Values.matrix.serverName }}.log.config: |
+  "{{ .Values.matrix.serverName }}.log.config": |
     version: 1
 
     formatters: