diff --git a/roles/matrix/tasks/main.yml b/roles/matrix/tasks/main.yml
index d0e87c0a20761936465864043e2d243c2428190f..253489f48b2f59fbf589c89b3bd36434cee3f3ce 100644
--- a/roles/matrix/tasks/main.yml
+++ b/roles/matrix/tasks/main.yml
@@ -78,7 +78,7 @@
 - name: Install synapse
   pip:
     name:
-      - 'matrix-synapse[postgres,oidc,systemd,url-preview,redis,user-search]==1.83.0'
+      - 'matrix-synapse[postgres,oidc,systemd,url-preview,redis,user-search]==1.84.1'
     state: latest
     extra_args: '--upgrade-strategy=eager'
     virtualenv: /var/lib/synapse/venv
diff --git a/roles/matrix/templates/homeserver.yaml.j2 b/roles/matrix/templates/homeserver.yaml.j2
index 3843e6a81d4bcf343ce90fa2dd8692664fbd023d..aa6d87219a288c308aa92f1cf21152883510bf23 100644
--- a/roles/matrix/templates/homeserver.yaml.j2
+++ b/roles/matrix/templates/homeserver.yaml.j2
@@ -163,8 +163,6 @@ suppress_key_server_warning: true
 
 # Worker config
 worker_app: synapse.app.homeserver
-worker_replication_host: 127.0.0.1
-worker_replication_http_port: 9093
 enable_media_repo: false
 notify_appservices_from_worker: appservice
 federation_sender_instances:
@@ -173,5 +171,9 @@ worker_replication_secret: "{{ vault_matrix_secrets.worker_replication_secret }}
 worker_log_config: "/etc/synapse/log_config.yaml"
 redis:
   enabled: true
+instance_map:
+  main:
+    host: 127.0.0.1
+    port: 9093
 
 # vim:set sw=2 sts=-1 et: