diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 5132f0311..6c0fddca4 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -6270,6 +6270,8 @@ matrix_element_call_container_labels_traefik_docker_network: "{{ matrix_playbook
 matrix_element_call_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}"
 matrix_element_call_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}"
 
+matrix_element_call_config_livekit_livekit_service_url: "{{ matrix_livekit_jwt_service_public_url if matrix_livekit_jwt_service_enabled else '' }}"
+
 ########################################################################
 #                                                                      #
 # /matrix-element-call                                                 #
diff --git a/roles/custom/matrix-element-call/defaults/main.yml b/roles/custom/matrix-element-call/defaults/main.yml
index 6d9730c19..c36254996 100644
--- a/roles/custom/matrix-element-call/defaults/main.yml
+++ b/roles/custom/matrix-element-call/defaults/main.yml
@@ -65,11 +65,11 @@ matrix_element_call_container_labels_traefik_additional_response_headers_auto: |
   }}
 matrix_element_call_container_labels_traefik_additional_response_headers_custom: {}
 
-# matrix_client_element_container_labels_additional_labels contains a multiline string with additional labels to add to the container label file.
+# matrix_element_call_container_labels_additional_labels contains a multiline string with additional labels to add to the container label file.
 # See `../templates/labels.j2` for details.
 #
 # Example:
-# matrix_client_element_container_labels_additional_labels: |
+# matrix_element_call_container_labels_additional_labels: |
 #   my.label=1
 #   another.label="here"
 matrix_element_call_container_labels_additional_labels: ''
@@ -145,4 +145,4 @@ matrix_element_call_config_default_server_config_m_homeserver_base_url: "{{ matr
 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 }}"
+matrix_element_call_config_livekit_livekit_service_url: ""
diff --git a/roles/custom/matrix-element-call/tasks/install.yml b/roles/custom/matrix-element-call/tasks/install.yml
index 19f221f15..49c3078f8 100644
--- a/roles/custom/matrix-element-call/tasks/install.yml
+++ b/roles/custom/matrix-element-call/tasks/install.yml
@@ -5,7 +5,6 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 ---
-# roles/custom/matrix-element-call/tasks/install.yml
 
 - name: Ensure Element Call paths exist
   ansible.builtin.file:
@@ -16,7 +15,6 @@
     group: "{{ matrix_user_groupname }}"
   with_items:
     - path: "{{ matrix_element_call_base_path }}"
-    - path: "{{ matrix_base_data_path }}/static-files/public/.well-known/element"  # Directory for element.json
 
 - name: Ensure Element Call config.json is in place
   ansible.builtin.template:
diff --git a/roles/custom/matrix-element-call/tasks/validate_config.yml b/roles/custom/matrix-element-call/tasks/validate_config.yml
index 06a625464..19934fc0f 100644
--- a/roles/custom/matrix-element-call/tasks/validate_config.yml
+++ b/roles/custom/matrix-element-call/tasks/validate_config.yml
@@ -14,6 +14,7 @@
   with_items:
     - {'name': 'matrix_element_call_container_network', when: true}
     - {'name': 'matrix_element_call_hostname', when: true}
+    - {'name': 'matrix_element_call_config_livekit_livekit_service_url', when: true}
 
 # Element Call appears to hardcode all paths to `/` (e.g. `/config.json`, `/assets/...`).
 # While we can properly serve the homepage and handle stripping the path prefix on our side,
diff --git a/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2 b/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2
index 0a781887d..f9cc7cd2b 100644
--- a/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2
+++ b/roles/custom/matrix-element-call/templates/systemd/matrix-element-call.service.j2
@@ -1,7 +1,7 @@
 #jinja2: lstrip_blocks: "True"
 [Unit]
 Description=Element Call
-{% for service in matrix_client_element_systemd_required_services_list %}
+{% for service in matrix_element_call_systemd_required_services_list %}
 Requires={{ service }}
 After={{ service }}
 {% endfor %}