diff --git a/roles/synapse/templates/conf.d/workers.yaml.j2 b/roles/synapse/templates/conf.d/workers.yaml.j2
index 0f47680..35876d9 100644
--- a/roles/synapse/templates/conf.d/workers.yaml.j2
+++ b/roles/synapse/templates/conf.d/workers.yaml.j2
@@ -6,7 +6,10 @@ redis:
 notify_appservices_from_worker: appservice-0
 {% endif %}
 {% if 'pusher' in synapse_workers %}
-start_pushers: false
+pusher_instances:
+{% for port in synapse_workers.pusher %}
+  - pusher-{{ loop.index0 }}
+{% endfor %}
 {% endif %}
 {% if 'user_dir' in synapse_workers %}
 update_user_directory_from_worker: user_dir-0
@@ -78,13 +81,8 @@ run_background_tasks_on: background_tasks-0
 {% endif %}
 
 {% if 'federation_sender' in synapse_workers %}
-send_federation: false
-
-{% if synapse_workers.federation_sender|length > 1 %}
 federation_sender_instances:
 {% for port in synapse_workers.federation_sender %}
   - federation_sender-{{ loop.index0 }}
 {% endfor %}
 {% endif %}
-
-{% endif %}
diff --git a/roles/synapse/vars/federation_sender.yml b/roles/synapse/vars/federation_sender.yml
index 9395643..14ed09c 100644
--- a/roles/synapse/vars/federation_sender.yml
+++ b/roles/synapse/vars/federation_sender.yml
@@ -1,4 +1,3 @@
 ---
 
-worker_app: federation_sender
 worker_listeners: []
diff --git a/roles/synapse/vars/pusher.yml b/roles/synapse/vars/pusher.yml
index 2e743a4..14ed09c 100644
--- a/roles/synapse/vars/pusher.yml
+++ b/roles/synapse/vars/pusher.yml
@@ -1,4 +1,3 @@
 ---
 
-worker_app: pusher
 worker_listeners: []