diff --git a/roles/custom/matrix-synapse/tasks/ext/setup_install.yml b/roles/custom/matrix-synapse/tasks/ext/setup_install.yml
index 0d8879392..4adb6566a 100644
--- a/roles/custom/matrix-synapse/tasks/ext/setup_install.yml
+++ b/roles/custom/matrix-synapse/tasks/ext/setup_install.yml
@@ -4,6 +4,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_encryption_disabler_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/encryption-disabler/setup_install.yml"
@@ -12,6 +14,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_password_provider_rest_auth_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/rest-auth/setup_install.yml"
@@ -20,6 +24,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_password_provider_shared_secret_auth_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/shared-secret-auth/setup_install.yml"
@@ -28,6 +34,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_password_provider_ldap_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/ldap-auth/setup_install.yml"
@@ -36,6 +44,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_spam_checker_synapse_simple_antispam_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/synapse-simple-antispam/setup_install.yml"
@@ -44,6 +54,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_spam_checker_mjolnir_antispam_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/mjolnir-antispam/setup_install.yml"
@@ -52,6 +64,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_ext_synapse_s3_storage_provider_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/s3-storage-provider/validate_config.yml"
diff --git a/roles/custom/matrix-synapse/tasks/setup_install.yml b/roles/custom/matrix-synapse/tasks/setup_install.yml
index 378a0dee5..a2185da57 100644
--- a/roles/custom/matrix-synapse/tasks/setup_install.yml
+++ b/roles/custom/matrix-synapse/tasks/setup_install.yml
@@ -26,6 +26,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - ansible.builtin.include_tasks: "{{ role_path }}/tasks/ext/setup_install.yml"
 
@@ -34,6 +36,8 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_synapse_workers_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/synapse/workers/setup_install.yml"
@@ -41,12 +45,16 @@
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - ansible.builtin.include_tasks: "{{ role_path }}/tasks/synapse/setup_install.yml"
 
 - tags:
     - setup-all
     - setup-synapse
+    - install-all
+    - install-synapse
   block:
     - when: matrix_s3_media_store_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/goofys/setup_install.yml"