diff --git a/roles/custom/matrix-livekit-server/defaults/main.yml b/roles/custom/matrix-livekit-server/defaults/main.yml
index c20f7247f..a71c955cc 100644
--- a/roles/custom/matrix-livekit-server/defaults/main.yml
+++ b/roles/custom/matrix-livekit-server/defaults/main.yml
@@ -11,7 +11,7 @@ livekit_server_container_http_host_bind_port: ''
 livekit_server_container_additional_networks: []  # No additional networks by default
 
 # Docker images
-livekit_server_image: "livekit/livekit-server:latest"
+livekit_server_container_image: "livekit/livekit-server:latest"
 
 # LiveKit configuration
 livekit_server_livekit_server_dev_key: "{{ livekit_server_dev_key }}"  # Must be defined in host_vars
diff --git a/roles/custom/matrix-livekit-server/tasks/install.yml b/roles/custom/matrix-livekit-server/tasks/install.yml
index 35aec98c2..30c2e87cd 100644
--- a/roles/custom/matrix-livekit-server/tasks/install.yml
+++ b/roles/custom/matrix-livekit-server/tasks/install.yml
@@ -32,7 +32,7 @@
 # Ensure Docker Images are Pulled
 - name: Ensure LiveKit Docker image is pulled
   community.docker.docker_image:
-    name: "{{ livekit_server_image }}"
+    name: "{{ livekit_server_container_image }}"
     source: pull
   register: livekit_image_result
   retries: 3
diff --git a/roles/custom/matrix-livekit-server/tasks/validate_config.yml b/roles/custom/matrix-livekit-server/tasks/validate_config.yml
index 0694efed8..6340ed26a 100644
--- a/roles/custom/matrix-livekit-server/tasks/validate_config.yml
+++ b/roles/custom/matrix-livekit-server/tasks/validate_config.yml
@@ -9,5 +9,5 @@
   with_items:
     - {'name': 'livekit_server_base_path', when: true}
     - {'name': 'livekit_server_container_network', when: true}
-    - {'name': 'livekit_server_image', when: true}
-    - {'name': 'livekit_server_image', when: true}
+    - {'name': 'livekit_server_container_image', when: true}
+    - {'name': 'livekit_server_container_image', when: true}
diff --git a/roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2 b/roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2
index 98c19e4dc..e078a898f 100644
--- a/roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2
+++ b/roles/custom/matrix-livekit-server/templates/systemd/matrix-livekit-server.service.j2
@@ -19,7 +19,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
     --network=host \
     --mount type=bind,src={{ livekit_server_base_path }}/livekit.yaml,dst=/etc/livekit.yaml,ro \
 	--label-file={{ livekit_server_base_path }}/labels \
-    {{ livekit_server_image }} \
+    {{ livekit_server_container_image }} \
     --dev --config /etc/livekit.yaml
 
 ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-livekit-server