diff --git a/roles/matrix-email2matrix/tasks/main.yml b/roles/matrix-email2matrix/tasks/main.yml
index 23114673..77be7279 100644
--- a/roles/matrix-email2matrix/tasks/main.yml
+++ b/roles/matrix-email2matrix/tasks/main.yml
@@ -8,8 +8,14 @@
     - setup-all
     - setup-email2matrix
 
-- import_tasks: "{{ role_path }}/tasks/setup_email2matrix.yml"
-  when: run_setup|bool
+- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  when: "run_setup|bool and matrix_email2matrix_enabled|bool"
+  tags:
+    - setup-all
+    - setup-email2matrix
+
+- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
+  when: "run_setup|bool and not matrix_email2matrix_enabled|bool"
   tags:
     - setup-all
     - setup-email2matrix
diff --git a/roles/matrix-email2matrix/tasks/setup_email2matrix.yml b/roles/matrix-email2matrix/tasks/setup_email2matrix.yml
deleted file mode 100644
index d5fa73a5..00000000
--- a/roles/matrix-email2matrix/tasks/setup_email2matrix.yml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-
-#
-# Tasks related to setting up Email2Matrix
-#
-
-- name: Ensure Email2Matrix paths exist
-  file:
-    path: "{{ item }}"
-    state: directory
-    mode: 0750
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-  with_items:
-    - "{{ matrix_email2matrix_base_path }}"
-    - "{{ matrix_email2matrix_config_dir_path }}"
-  when: matrix_email2matrix_enabled|bool
-
-- name: Ensure Email2Matrix configuration file created
-  template:
-    src: "{{ role_path }}/templates/config.json.j2"
-    dest: "{{ matrix_email2matrix_config_dir_path }}/config.json"
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-    mode: 0640
-  when: matrix_email2matrix_enabled|bool
-
-- name: Ensure Email2Matrix image is pulled
-  docker_image:
-    name: "{{ matrix_email2matrix_docker_image }}"
-    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ matrix_email2matrix_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
-    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_email2matrix_docker_image_force_pull }}"
-  when: matrix_email2matrix_enabled|bool
-
-- name: Ensure matrix-email2matrix.service installed
-  template:
-    src: "{{ role_path }}/templates/systemd/matrix-email2matrix.service.j2"
-    dest: "{{ matrix_systemd_path }}/matrix-email2matrix.service"
-    mode: 0644
-  register: matrix_email2matrix_systemd_service_result
-  when: matrix_email2matrix_enabled|bool
-
-- name: Ensure systemd reloaded after matrix-email2matrix.service installation
-  service:
-    daemon_reload: yes
-  when: "matrix_email2matrix_enabled|bool and matrix_email2matrix_systemd_service_result.changed"
-
-#
-# Tasks related to getting rid of the Email2Matrix (if it was previously enabled)
-#
-
-- name: Check existence of matrix-email2matrix service
-  stat:
-    path: "{{ matrix_systemd_path }}/matrix-email2matrix.service"
-  register: matrix_email2matrix_service_stat
-  when: "not matrix_email2matrix_enabled|bool"
-
-- name: Ensure matrix-email2matrix is stopped
-  service:
-    name: matrix-email2matrix
-    state: stopped
-    daemon_reload: yes
-  register: stopping_result
-  when: "not matrix_email2matrix_enabled|bool and matrix_email2matrix_service_stat.stat.exists"
-
-- name: Ensure matrix-email2matrix.service doesn't exist
-  file:
-    path: "{{ matrix_systemd_path }}/matrix-email2matrix.service"
-    state: absent
-  when: "not matrix_email2matrix_enabled|bool and matrix_email2matrix_service_stat.stat.exists"
-
-- name: Ensure systemd reloaded after matrix-email2matrix.service removal
-  service:
-    daemon_reload: yes
-  when: "not matrix_email2matrix_enabled|bool and matrix_email2matrix_service_stat.stat.exists"
-
-- name: Ensure Email2Matrix data path doesn't exist
-  file:
-    path: "{{ matrix_email2matrix_base_path }}"
-    state: absent
-  when: "not matrix_email2matrix_enabled|bool"
-
-- name: Ensure Email2Matrix Docker image doesn't exist
-  docker_image:
-    name: "{{ matrix_email2matrix_docker_image }}"
-    state: absent
-  when: "not matrix_email2matrix_enabled|bool"
diff --git a/roles/matrix-email2matrix/tasks/setup_install.yml b/roles/matrix-email2matrix/tasks/setup_install.yml
new file mode 100644
index 00000000..a167911f
--- /dev/null
+++ b/roles/matrix-email2matrix/tasks/setup_install.yml
@@ -0,0 +1,39 @@
+---
+
+- name: Ensure Email2Matrix paths exist
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: 0750
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+  with_items:
+    - "{{ matrix_email2matrix_base_path }}"
+    - "{{ matrix_email2matrix_config_dir_path }}"
+
+- name: Ensure Email2Matrix configuration file created
+  template:
+    src: "{{ role_path }}/templates/config.json.j2"
+    dest: "{{ matrix_email2matrix_config_dir_path }}/config.json"
+    owner: "{{ matrix_user_username }}"
+    group: "{{ matrix_user_groupname }}"
+    mode: 0640
+
+- name: Ensure Email2Matrix image is pulled
+  docker_image:
+    name: "{{ matrix_email2matrix_docker_image }}"
+    source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
+    force_source: "{{ matrix_email2matrix_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
+    force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_email2matrix_docker_image_force_pull }}"
+
+- name: Ensure matrix-email2matrix.service installed
+  template:
+    src: "{{ role_path }}/templates/systemd/matrix-email2matrix.service.j2"
+    dest: "{{ matrix_systemd_path }}/matrix-email2matrix.service"
+    mode: 0644
+  register: matrix_email2matrix_systemd_service_result
+
+- name: Ensure systemd reloaded after matrix-email2matrix.service installation
+  service:
+    daemon_reload: yes
+  when: "matrix_email2matrix_systemd_service_result.changed|bool"
diff --git a/roles/matrix-email2matrix/tasks/setup_uninstall.yml b/roles/matrix-email2matrix/tasks/setup_uninstall.yml
new file mode 100644
index 00000000..b0b44cca
--- /dev/null
+++ b/roles/matrix-email2matrix/tasks/setup_uninstall.yml
@@ -0,0 +1,35 @@
+---
+
+- name: Check existence of matrix-email2matrix service
+  stat:
+    path: "{{ matrix_systemd_path }}/matrix-email2matrix.service"
+  register: matrix_email2matrix_service_stat
+
+- name: Ensure matrix-email2matrix is stopped
+  service:
+    name: matrix-email2matrix
+    state: stopped
+    daemon_reload: yes
+  register: stopping_result
+  when: "matrix_email2matrix_service_stat.stat.exists|bool"
+
+- name: Ensure matrix-email2matrix.service doesn't exist
+  file:
+    path: "{{ matrix_systemd_path }}/matrix-email2matrix.service"
+    state: absent
+  when: "matrix_email2matrix_service_stat.stat.exists|bool"
+
+- name: Ensure systemd reloaded after matrix-email2matrix.service removal
+  service:
+    daemon_reload: yes
+  when: "matrix_email2matrix_service_stat.stat.exists|bool"
+
+- name: Ensure Email2Matrix data path doesn't exist
+  file:
+    path: "{{ matrix_email2matrix_base_path }}"
+    state: absent
+
+- name: Ensure Email2Matrix Docker image doesn't exist
+  docker_image:
+    name: "{{ matrix_email2matrix_docker_image }}"
+    state: absent