diff --git a/docs/configuring-playbook-bridge-mautrix-telegram.md b/docs/configuring-playbook-bridge-mautrix-telegram.md
index 9246230bf..693c81687 100644
--- a/docs/configuring-playbook-bridge-mautrix-telegram.md
+++ b/docs/configuring-playbook-bridge-mautrix-telegram.md
@@ -12,18 +12,6 @@ matrix_mautrix_telegram_api_id: YOUR_TELEGRAM_APP_ID
 matrix_mautrix_telegram_api_hash: YOUR_TELEGRAM_API_HASH
 ```
 
-**Note**: For architectures different from `amd64` you need to trigger a local rebuild:
-
-```yaml
-matrix_mautrix_telegram_container_self_build: true
-```
-
-Lastly, to take these changes into effect, re-run the playbook:
-
-```yaml
-ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start
-```
-
 ## Set up Double Puppeting
 
 If you'd like to use [Double Puppeting](https://github.com/tulir/mautrix-telegram/wiki/Authentication#replacing-telegram-accounts-matrix-puppet-with-matrix-account) (hint: you most likely do), you have 2 ways of going about it.
diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 6111600e5..6b54029b1 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -305,6 +305,9 @@ matrix_mautrix_signal_database_password: "{{ matrix_synapse_macaroon_secret_key
 # We don't enable bridges by default.
 matrix_mautrix_telegram_enabled: false
 
+# self-building
+matrix_mautrix_telegram_container_self_build: "{{ matrix_architecture != 'amd64'}}"
+
 matrix_mautrix_telegram_systemd_required_services_list: |
   {{
     ['docker.service']