diff --git a/roles/custom/matrix-element-call/defaults/main.yml b/roles/custom/matrix-element-call/defaults/main.yml
index bd915b6c2..6d9730c19 100644
--- a/roles/custom/matrix-element-call/defaults/main.yml
+++ b/roles/custom/matrix-element-call/defaults/main.yml
@@ -137,3 +137,12 @@ matrix_element_call_hsts_preload_enabled: false
 # Enable or disable metrics collection
 matrix_element_call_metrics_enabled: false
 matrix_element_call_metrics_port: 2112
+
+# Controls the default_server_config/m.homeserver/base_url property in the config.json file.
+matrix_element_call_config_default_server_config_m_homeserver_base_url: "{{ matrix_homeserver_url }}"
+
+# Controls the default_server_config/m.homeserver/server_name property in the config.json file.
+matrix_element_call_config_default_server_config_m_homeserver_server_name: "{{ matrix_domain }}"
+
+# Controls the livekit/livekit_service_url property in the config.json file.
+matrix_element_call_config_livekit_livekit_service_url: "{{ matrix_livekit_jwt_service_public_url }}"
diff --git a/roles/custom/matrix-element-call/templates/config.json.j2 b/roles/custom/matrix-element-call/templates/config.json.j2
index 4ad4e2b51..1ef5adb9f 100644
--- a/roles/custom/matrix-element-call/templates/config.json.j2
+++ b/roles/custom/matrix-element-call/templates/config.json.j2
@@ -1,11 +1,11 @@
 {
   "default_server_config": {
     "m.homeserver": {
-      "base_url": "{{ matrix_homeserver_url }}",
-      "server_name": "{{ matrix_domain }}"
+      "base_url": {{ matrix_element_call_config_default_server_config_m_homeserver_base_url | to_json }},
+      "server_name": {{ matrix_element_call_config_default_server_config_m_homeserver_server_name | to_json}}
     }
   },
   "livekit": {
-    "livekit_service_url": "{{ matrix_livekit_jwt_service_public_url }}"
+    "livekit_service_url": {{ matrix_element_call_config_livekit_livekit_service_url | to_json }}
   }
 }
diff --git a/roles/custom/matrix-element-call/templates/config.json.j2.license b/roles/custom/matrix-element-call/templates/config.json.j2.license
index 4c387fb5a..085b430a3 100644
--- a/roles/custom/matrix-element-call/templates/config.json.j2.license
+++ b/roles/custom/matrix-element-call/templates/config.json.j2.license
@@ -1,5 +1,5 @@
 SPDX-FileCopyrightText: 2022 MDAD project contributors
 SPDX-FileCopyrightText: 2024 wjbeckett
-SPDX-FileCopyrightText: 2024 Slavi Pantaleev
+SPDX-FileCopyrightText: 2024 - 2025 Slavi Pantaleev
 
 SPDX-License-Identifier: AGPL-3.0-or-later