diff --git a/roles/matrix-prometheus/tasks/main.yml b/roles/matrix-prometheus/tasks/main.yml
index 2290048f3..edb019881 100644
--- a/roles/matrix-prometheus/tasks/main.yml
+++ b/roles/matrix-prometheus/tasks/main.yml
@@ -8,7 +8,14 @@
     - setup-all
     - setup-prometheus
 
-- import_tasks: "{{ role_path }}/tasks/setup.yml"
+- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
+  when: "run_setup|bool and matrix_prometheus_enabled|bool"
+  tags:
+    - setup-all
+    - setup-prometheus
+
+- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
+  when: "run_setup|bool and not matrix_prometheus_enabled|bool"
   tags:
     - setup-all
     - setup-prometheus
diff --git a/roles/matrix-prometheus/tasks/setup.yml b/roles/matrix-prometheus/tasks/setup_install.yml
similarity index 59%
rename from roles/matrix-prometheus/tasks/setup.yml
rename to roles/matrix-prometheus/tasks/setup_install.yml
index 7b98b76ab..b69e349d8 100644
--- a/roles/matrix-prometheus/tasks/setup.yml
+++ b/roles/matrix-prometheus/tasks/setup_install.yml
@@ -1,16 +1,11 @@
 ---
 
-#
-# Tasks related to setting up matrix-prometheus
-#
-
 - name: Ensure matrix-prometheus image is pulled
   docker_image:
     name: "{{ matrix_prometheus_docker_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
     force_source: "{{ matrix_prometheus_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_prometheus_docker_image_force_pull }}"
-  when: "matrix_prometheus_enabled|bool"
 
 - name: Ensure Prometheus paths exists
   file:
@@ -23,7 +18,6 @@
     - "{{ matrix_prometheus_base_path }}"
     - "{{ matrix_prometheus_config_path }}"
     - "{{ matrix_prometheus_data_path }}"
-  when: matrix_prometheus_enabled|bool
 
 - block:
     # Well, this actually creates the network if it doesn't exist, but..
@@ -38,7 +32,7 @@
 
     - set_fact:
         matrix_prometheus_scraper_node_targets: ["{{ matrix_docker_network_info.network.IPAM.Config[0].Gateway }}:9100"]
-  when: "matrix_prometheus_enabled|bool and matrix_prometheus_scraper_node_enabled|bool and matrix_prometheus_scraper_node_targets|length == 0"
+  when: "matrix_prometheus_scraper_node_enabled|bool and matrix_prometheus_scraper_node_targets|length == 0"
 
 - name: Ensure prometheus.yml installed
   copy:
@@ -47,7 +41,6 @@
     mode: 0644
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
-  when: matrix_prometheus_enabled|bool
 
 - name: Download synapse-v2.rules
   get_url:
@@ -57,8 +50,6 @@
     mode: 0440
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
-  when: matrix_prometheus_enabled|bool
-
 
 - name: Ensure matrix-prometheus.service installed
   template:
@@ -66,43 +57,8 @@
     dest: "{{ matrix_systemd_path }}/matrix-prometheus.service"
     mode: 0644
   register: matrix_prometheus_systemd_service_result
-  when: matrix_prometheus_enabled|bool
 
 - name: Ensure systemd reloaded after matrix-prometheus.service installation
   service:
     daemon_reload: yes
-  when: "matrix_prometheus_enabled|bool and matrix_prometheus_systemd_service_result.changed"
-
-#
-# Tasks related to getting rid of matrix-prometheus (if it was previously enabled)
-#
-
-- name: Check existence of matrix-prometheus service
-  stat:
-    path: "{{ matrix_systemd_path }}/matrix-prometheus.service"
-  register: matrix_prometheus_service_stat
-
-- name: Ensure matrix-prometheus is stopped
-  service:
-    name: matrix-prometheus
-    state: stopped
-    daemon_reload: yes
-  register: stopping_result
-  when: "not matrix_prometheus_enabled|bool and matrix_prometheus_service_stat.stat.exists"
-
-- name: Ensure matrix-prometheus.service doesn't exist
-  file:
-    path: "{{ matrix_systemd_path }}/matrix-prometheus.service"
-    state: absent
-  when: "not matrix_prometheus_enabled|bool and matrix_prometheus_service_stat.stat.exists"
-
-- name: Ensure systemd reloaded after matrix-prometheus.service removal
-  service:
-    daemon_reload: yes
-  when: "not matrix_prometheus_enabled|bool and matrix_prometheus_service_stat.stat.exists"
-
-- name: Ensure matrix-prometheus Docker image doesn't exist
-  docker_image:
-    name: "{{ matrix_prometheus_docker_image }}"
-    state: absent
-  when: "not matrix_prometheus_enabled|bool"
+  when: "matrix_prometheus_systemd_service_result.changed|bool"
diff --git a/roles/matrix-prometheus/tasks/setup_uninstall.yml b/roles/matrix-prometheus/tasks/setup_uninstall.yml
new file mode 100644
index 000000000..0a4a8cb64
--- /dev/null
+++ b/roles/matrix-prometheus/tasks/setup_uninstall.yml
@@ -0,0 +1,31 @@
+---
+
+- name: Check existence of matrix-prometheus service
+  stat:
+    path: "{{ matrix_systemd_path }}/matrix-prometheus.service"
+  register: matrix_prometheus_service_stat
+
+- name: Ensure matrix-prometheus is stopped
+  service:
+    name: matrix-prometheus
+    state: stopped
+    daemon_reload: yes
+  register: stopping_result
+  when: "matrix_prometheus_service_stat.stat.exists|bool"
+
+- name: Ensure matrix-prometheus.service doesn't exist
+  file:
+    path: "{{ matrix_systemd_path }}/matrix-prometheus.service"
+    state: absent
+  when: "matrix_prometheus_service_stat.stat.exists|bool"
+
+- name: Ensure systemd reloaded after matrix-prometheus.service removal
+  service:
+    daemon_reload: yes
+  when: "matrix_prometheus_service_stat.stat.exists|bool"
+
+- name: Ensure matrix-prometheus Docker image doesn't exist
+  docker_image:
+    name: "{{ matrix_prometheus_docker_image }}"
+    state: absent
+  when: "not matrix_prometheus_enabled|bool"