diff --git a/roles/custom/matrix-element-call/tasks/uninstall.yml b/roles/custom/matrix-element-call/tasks/uninstall.yml
index f863c25be..d9a77415f 100644
--- a/roles/custom/matrix-element-call/tasks/uninstall.yml
+++ b/roles/custom/matrix-element-call/tasks/uninstall.yml
@@ -1,51 +1,51 @@
 ---
----
-# roles/custom/matrix-element-call/tasks/uninstall.yml
+# Uninstall tasks for matrix-element-call
 
-# Stop and remove Docker containers
-- name: Stop and remove matrix-element-call Docker container
+- name: Stop and remove matrix-element-call container
   community.docker.docker_container:
     name: "matrix-element-call"
     state: absent
-  when: matrix_element_call_enabled | bool == false
 
-- name: Stop and remove jwt-service Docker container
+- name: Stop and remove jwt-service container
   community.docker.docker_container:
     name: "matrix-jwt-service"
     state: absent
-  when: matrix_element_call_enabled | bool == false
 
-- name: Stop and remove livekit Docker container
+- name: Stop and remove livekit container
   community.docker.docker_container:
     name: "matrix-livekit"
     state: absent
-  when: matrix_element_call_enabled | bool == false
 
-- name: Stop and remove redis Docker container
+- name: Stop and remove redis container
   community.docker.docker_container:
     name: "matrix-redis"
     state: absent
-  when: matrix_element_call_enabled | bool == false
 
-# Remove matrix-element-call directories
-- name: Remove matrix-element-call directories
-  ansible.builtin.file:
-    path: "{{ item }}"
-    state: absent
-  loop:
-    - "{{ matrix_element_call_base_path }}"
-  when: matrix_element_call_enabled | bool == false
-
-# Disable and remove systemd service for matrix-element-call
-- name: Stop and disable matrix-element-call systemd service
-  ansible.builtin.systemd:
-    name: matrix-element-call
-    state: stopped
-    enabled: false
-  when: matrix_element_call_enabled | bool == false
-
-- name: Remove matrix-element-call systemd service file
+- name: Remove matrix-element-call systemd service
   ansible.builtin.file:
     path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-element-call.service"
     state: absent
-  when: matrix_element_call_enabled | bool == false
\ No newline at end of file
+
+- name: Remove jwt-service systemd service
+  ansible.builtin.file:
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-jwt-service.service"
+    state: absent
+
+- name: Remove livekit systemd service
+  ansible.builtin.file:
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-livekit.service"
+    state: absent
+
+- name: Remove redis systemd service
+  ansible.builtin.file:
+    path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-redis.service"
+    state: absent
+
+- name: Remove matrix-element-call configuration files
+  ansible.builtin.file:
+    path: "{{ matrix_element_call_base_path }}"
+    state: absent
+
+- name: Reload systemd daemon
+  ansible.builtin.systemd:
+    daemon_reload: true