diff --git a/docs/configuring-playbook-bridge-mautrix-whatsapp.md b/docs/configuring-playbook-bridge-mautrix-whatsapp.md
index 0101cecc2..1e94e6186 100644
--- a/docs/configuring-playbook-bridge-mautrix-whatsapp.md
+++ b/docs/configuring-playbook-bridge-mautrix-whatsapp.md
@@ -13,11 +13,18 @@ matrix_mautrix_whatsapp_enabled: true
 ## Enable backfilling history
 This requires a server with MSC2716 support, which is currently an experimental feature in synapse.
 Note that as of Synapse 1.46, there are still some bugs with the implementation, especially if using event persistence workers.
-
 Use the following playbook configuration:
 
 ```yaml
-matrix_bridges_backfill_enabled: true
+matrix_synapse_configuration_extension_yaml: |
+  experimental_features:
+    msc2716_enabled: true
+```
+```yaml
+matrix_mautrix_whatsapp_configuration_extension_yaml:
+  bridge:
+    history_sync:
+      backfill: true
 ```
 
 ## Set up Double Puppeting
diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index a6f287f6d..f61a53814 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -98,10 +98,6 @@ matrix_identity_server_url: ~
 matrix_integration_manager_rest_url: ~
 matrix_integration_manager_ui_url: ~
 
-# Enable backfilling history sync payloads from bridges using batch sending?
-# This requires a server with MSC2716 support, which is currently an experimental feature in synapse.
-matrix_bridges_backfill_enabled: false
-
 # The domain name where a Jitsi server is self-hosted.
 # If set, `/.well-known/matrix/client` will suggest Element clients to use that Jitsi server.
 # See: https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md#configuring-element-to-use-your-self-hosted-jitsi-server
diff --git a/roles/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2 b/roles/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2
index 8e6d8edac..133cba2a1 100644
--- a/roles/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2
+++ b/roles/matrix-bridge-mautrix-whatsapp/templates/config.yaml.j2
@@ -33,7 +33,7 @@ appservice:
         max_idle_conns: 2
 
     # The unique ID of this appservice.
-    id: whatsapp
+    id: whatsappbot
     # Appservice bot details.
     bot:
         # Username of the appservice bot.
@@ -77,12 +77,13 @@ bridge:
         # This requires a server with MSC2716 support, which is currently an experimental feature in synapse.
         # It can be enabled by setting experimental_features -> msc2716_enabled to true in homeserver.yaml.
         # Note that as of Synapse 1.46, there are still some bugs with the implementation, especially if using event persistence workers.
-        backfill: {{ matrix_bridges_backfill_enabled }}
+        backfill: false
         # Use double puppets for backfilling?
         # In order to use this, the double puppets must be in the appservice's user ID namespace
         # (because the bridge can't use the double puppet access token with batch sending).
         # This only affects double puppets on the local server, double puppets on other servers will never be used.
-        double_puppet_backfill: {{ matrix_bridges_backfill_enabled }}
+        # Doesn't work out of box with this playbook
+        double_puppet_backfill: false
         # Should the bridge request a full sync from the phone when logging in?
         # This bumps the size of history syncs from 3 months to 1 year.
         request_full_sync: false
@@ -137,6 +138,9 @@ bridge:
     # Should WhatsApp status messages be bridged into a Matrix room?
     # Disabling this won't affect already created status broadcast rooms.
     enable_status_broadcast: true
+    # Should the status broadcast room be muted and moved into low priority by default?
+    # This is only applied when creating the room, the user can unmute/untag it later.
+    mute_status_broadcast: true
     # Should the bridge use thumbnails from WhatsApp?
     # They're disabled by default due to very low resolution.
     whatsapp_thumbnail: false
diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index aa99d94d5..cebe7a1f6 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -2875,11 +2875,6 @@ opentracing:
 #  events: worker1
 #  typing: worker1
 
-{% if matrix_bridges_backfill_enabled %}
-Experimental:
-  msc2716_enabled: true
-{% endif %}
-
 # The worker that is used to run background tasks (e.g. cleaning up expired
 # data). If not provided this defaults to the main process.
 #