diff --git a/roles/custom/matrix-element-call/defaults/main.yml b/roles/custom/matrix-element-call/defaults/main.yml
index 3fe77edde..d6aaf02e0 100644
--- a/roles/custom/matrix-element-call/defaults/main.yml
+++ b/roles/custom/matrix-element-call/defaults/main.yml
@@ -5,7 +5,7 @@
 matrix_element_call_enabled: false
 
 # Default Matrix server name (can be overridden in host_vars if needed)
-matrix_server_name: "{{ matrix_base_domain }}"
+matrix_server_name: "{{ matrix_domain }}"
 
 # Base path configuration
 matrix_element_call_base_path: "/home/{{ matrix_user_username }}/dockerdata/volumes/elementcall"
@@ -28,10 +28,10 @@ redis_port: "6379"
 
 # LiveKit configuration (should be set in host_vars or globally)
 matrix_element_call_livekit_dev_key: "{{ matrix_livekit_dev_key | default('unset-livekit-key') }}"
-matrix_element_call_livekit_service_url: "wss://sfu.{{ matrix_base_domain }}:443"
+matrix_element_call_livekit_service_url: "wss://sfu.{{ matrix_domain }}:443"
 
 # Well-known paths and domains (derived from matrix_base_domain)
-matrix_element_call_domain: "call.{{ matrix_base_domain }}"
+matrix_element_call_domain: "call.{{ matrix_domain }}"
 matrix_element_call_well_known_client_path: "/var/www/.well-known/matrix/client"
 matrix_element_call_well_known_element_path: "/var/www/.well-known/element/element.json"
 matrix_element_call_base_url: "https://{{ matrix_element_call_domain }}"