diff --git a/package-riot/templates/matrix-homeserver.yaml.j2 b/package-riot/templates/matrix-homeserver.yaml.j2
index fcc0b05..fd9c94e 100644
--- a/package-riot/templates/matrix-homeserver.yaml.j2
+++ b/package-riot/templates/matrix-homeserver.yaml.j2
@@ -5,7 +5,7 @@ no_tls: True
 tls_fingerprints: []
 pid_file: "/var/run/matrix-synapse.pid"
 soft_file_limit: 0
-public_baseurl: "https://im.bonifacelabs.ca"
+public_baseurl: "https://im.{{ blsedomains_webdomain }}"
 listeners:
   - port: 8008
     tls: false
@@ -96,13 +96,13 @@ email:
    smtp_user: "{{ username_email_root }}"
    smtp_pass: "{{ passwd_email_root }}"
    require_transport_security: True
-   notif_from: "The BLSE Matrix Server <matrix@bonifacelabs.ca>"
+   notif_from: "The BLSE Matrix Server <matrix@{{ blsedomains_webdomain }}"
    app_name: Matrix
    template_dir: res/templates
    notif_template_html: notif_mail.html
    notif_template_text: notif_mail.txt
    notif_for_new_users: True
-   riot_base_url: "https://riot.bonifacelabs.ca"
+   riot_base_url: "https://riot.{{ blsedomains_webdomain }}"
 password_providers:
   - module: "rest_auth_provider.RestAuthProvider"
     config: