diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 8fc11fbe4..0b1707b7f 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -6064,14 +6064,10 @@ matrix_element_call_container_labels_traefik_tls_certResolver: "{{ traefik_certR
 
 livekit_server_enabled: "{{ matrix_element_call_enabled }}"
 
-livekit_server_scheme: "https"
-livekit_server_hostname: "sfu.{{ matrix_domain }}"  # Default hostname; should be overridden in host_vars if different
-livekit_server_path_prefix: "/"
-livekit_server_base_path: "{{ matrix_base_data_path }}/livekit-server"
-livekit_server_container_image: "livekit/livekit-server:{{ livekit_server_version }}"
-livekit_server_container_image_force_pull: true
+livekit_server_hostname: "sfu.{{ matrix_domain }}"
+
+livekit_server_container_image_self_build: "{{ matrix_architecture not in ['arm64', 'amd64'] }}"
 
-# Docker network configuration for Livekit
 livekit_server_container_network: "{{ matrix_addons_container_network }}"
 livekit_server_container_additional_networks_auto: "{{ [matrix_playbook_reverse_proxyable_services_additional_network] if (livekit_server_container_labels_traefik_enabled and matrix_playbook_reverse_proxyable_services_additional_network) else [] }}"
 
@@ -6081,8 +6077,6 @@ matrix_livekit_container_labels_traefik_docker_network: "{{ matrix_playbook_reve
 livekit_server_container_labels_traefik_entrypoints: "{{ traefik_entrypoint_primary }}"
 livekit_server_container_labels_traefik_tls_certResolver: "{{ traefik_certResolver_primary }}"
 
-# LiveKit Service Configuration
-livekit_server_livekit_dev_key: "{{ livekit_server_dev_key }}"  # LiveKit dev key
 
 ########################################################################
 #                                                                      #
diff --git a/roles/custom/matrix-livekit-server/defaults/main.yml b/roles/custom/matrix-livekit-server/defaults/main.yml
index 17a894e2e..b080f1022 100644
--- a/roles/custom/matrix-livekit-server/defaults/main.yml
+++ b/roles/custom/matrix-livekit-server/defaults/main.yml
@@ -10,6 +10,9 @@ livekit_server_base_path: "{{ matrix_base_data_path }}/livekit-server"
 # renovate: datasource=docker depName=livekit/livekit-server
 livekit_server_version: v1.8.0
 
+livekit_server_hostname: ""
+livekit_server_path_prefix: "/"
+
 # Docker network configuration
 livekit_server_container_network: ''
 livekit_server_container_http_host_bind_port: ''
@@ -23,7 +26,7 @@ livekit_server_container_repo: "https://github.com/livekit/livekit.git"
 livekit_server_container_repo_version: "{{ 'main' if livekit_server_version == 'latest' else livekit_server_version }}"
 livekit_server_container_src_files_path: "{{ livekit_server_base_path }}/container-src"
 
-livekit_server_container_image: "livekit/livekit-server:latest"
+livekit_server_container_image: "{{ livekit_server_container_image_name_prefix }}livekit/livekit-server:{{ livekit_server_version }}"
 livekit_server_container_image_name_prefix: "{{ 'localhost/' if livekit_server_container_image_self_build else 'docker.io/' }}"
 livekit_server_container_image_force_pull: "{{ livekit_server_container_image.endswith(':latest') }}"
 
diff --git a/roles/custom/matrix-livekit-server/tasks/validate_config.yml b/roles/custom/matrix-livekit-server/tasks/validate_config.yml
index 6340ed26a..9d55b3733 100644
--- a/roles/custom/matrix-livekit-server/tasks/validate_config.yml
+++ b/roles/custom/matrix-livekit-server/tasks/validate_config.yml
@@ -7,6 +7,7 @@
       You need to define a required configuration setting (`{{ item.name }}`).
   when: "item.when | bool and vars[item.name] == ''"
   with_items:
+    - {'name': 'livekit_server_hostname', when: true}
     - {'name': 'livekit_server_base_path', when: true}
     - {'name': 'livekit_server_container_network', when: true}
     - {'name': 'livekit_server_container_image', when: true}