diff --git a/roles/synapse/handlers/main.yml b/roles/synapse/handlers/main.yml
index 7c75a99..1553ab4 100644
--- a/roles/synapse/handlers/main.yml
+++ b/roles/synapse/handlers/main.yml
@@ -27,4 +27,6 @@
     daemon_reload: true
     name: matrix-synchrotron@{{ item }}.service
     enabled: false
-  loop: "{{ synapse_synchrotrons }}"
+  loop:
+    - balancer
+    - init
diff --git a/roles/synapse/tasks/worker_type.yml b/roles/synapse/tasks/worker_type.yml
index 1e62214..7acc3bb 100644
--- a/roles/synapse/tasks/worker_type.yml
+++ b/roles/synapse/tasks/worker_type.yml
@@ -33,8 +33,3 @@
 - name: Include worker instance tasks for {{ worker_type }}
   ansible.builtin.include_tasks: worker_instance.yml
   when: worker_ports|length == 0
-
-- name: Append synchrotron variable
-  ansible.builtin.set_fact:
-    synapse_synchrotrons: "{{ synapse_synchrotrons + [synchrotron_type] }}"
-  when: synchrotron_type is defined and synchrotron_type not in synapse_synchrotrons
diff --git a/roles/synapse/tasks/workers.yml b/roles/synapse/tasks/workers.yml
index 6c66b94..2f8e481 100644
--- a/roles/synapse/tasks/workers.yml
+++ b/roles/synapse/tasks/workers.yml
@@ -25,7 +25,6 @@
 - name: Initialize synapse worker vars
   ansible.builtin.set_fact:
     synapse_worker_services: []
-    synapse_synchrotrons: []
 
 - name: Configure workers
   ansible.builtin.include_tasks: worker_type.yml
@@ -45,4 +44,3 @@
 
 - name: Ensure synchrotron balancer removed (legacy)
   ansible.builtin.include_tasks: matrix-synchrotrons.yml
-  when: synapse_synchrotrons | length != 0
diff --git a/roles/synapse/vars/generic_init_sync.yml b/roles/synapse/vars/generic_init_sync.yml
deleted file mode 100644
index 27ba224..0000000
--- a/roles/synapse/vars/generic_init_sync.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-synchrotron_type: init
diff --git a/roles/synapse/vars/generic_sync.yml b/roles/synapse/vars/generic_sync.yml
deleted file mode 100644
index 9768363..0000000
--- a/roles/synapse/vars/generic_sync.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-synchrotron_type: balancer