diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2
index 5ae601a48..0179cc355 100644
--- a/roles/matrix-riot-web/templates/config.json.j2
+++ b/roles/matrix-riot-web/templates/config.json.j2
@@ -15,9 +15,9 @@
 	},
 	"welcomeUserId": {{ matrix_riot_web_welcome_user_id|string|to_json }},
 	{% if matrix_riot_web_enable_presence_by_hs_url is not none %}
-		"enable_presence_by_hs_url": {{ matrix_riot_web_enable_presence_by_hs_url|string|to_json }},
+		"enable_presence_by_hs_url": {{ matrix_riot_web_enable_presence_by_hs_url|to_json }},
 	{% endif %}
 	"embeddedPages": {
-		"homeUrl": {{ matrix_riot_web_embedded_pages_home_url|string}to_json }}
+		"homeUrl": {{ matrix_riot_web_embedded_pages_home_url|string|to_json }}
 	}
 }
diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index 5b9b7f775..e0ff67d30 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -255,11 +255,11 @@ listeners:
 # instance, if using certbot, use `fullchain.pem` as your certificate,
 # not `cert.pem`).
 #
-tls_certificate_path: {{ matrix_synapse_tls_certificate_path|string|to_json }}
+tls_certificate_path: {{ matrix_synapse_tls_certificate_path|to_json }}
 
 # PEM-encoded private key for TLS
 #
-tls_private_key_path: {{ matrix_synapse_tls_private_key_path|string|to_json }}
+tls_private_key_path: {{ matrix_synapse_tls_private_key_path|to_json }}
 
 # ACME support: This will configure Synapse to request a valid TLS certificate
 # for your configured `server_name` via Let's Encrypt.
@@ -915,7 +915,7 @@ password_config:
 email:
    enable_notifs: true
    smtp_host: {{ matrix_synapse_email_smtp_host|string|to_json }}
-   smtp_port: {{ matrix_synapse_email_smtp_port|string|to_json }}
+   smtp_port: {{ matrix_synapse_email_smtp_port|to_json }}
    require_transport_security: {{ matrix_synapse_email_smtp_require_transport_security|to_json }}
    notif_from: {{ matrix_synapse_email_notif_from|string|to_json }}
    app_name: Matrix