diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index 90482810..f8edc5c9 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -298,7 +298,7 @@ matrix_beeper_linkedin_database_password: "{{ '%s' | format(matrix_homeserver_ge
 # We don't enable bridges by default.
 matrix_go_skype_bridge_enabled: false
 
-matrix_go_skype_bridge_container_image_self_build: true
+matrix_go_skype_bridge_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"
 
 matrix_go_skype_bridge_systemd_required_services_list: |
   {{
@@ -681,7 +681,7 @@ matrix_mautrix_discord_systemd_required_services_list: |
     (['matrix-postgres.service'] if matrix_postgres_enabled else [])
     +
     (['matrix-nginx-proxy.service'] if matrix_nginx_proxy_enabled else [])
-  }} 
+  }}
 
 matrix_mautrix_discord_appservice_token: "{{ '%s' | format(matrix_homeserver_generic_secret_key) | password_hash('sha512', 'maudisc.as.tok') | to_uuid }}"
 
diff --git a/roles/matrix-bridge-go-skype-bridge/defaults/main.yml b/roles/matrix-bridge-go-skype-bridge/defaults/main.yml
index 44751cad..0777fbc3 100644
--- a/roles/matrix-bridge-go-skype-bridge/defaults/main.yml
+++ b/roles/matrix-bridge-go-skype-bridge/defaults/main.yml
@@ -4,7 +4,7 @@
 
 matrix_go_skype_bridge_enabled: true
 
-matrix_go_skype_bridge_container_image_self_build: true
+matrix_go_skype_bridge_container_image_self_build: false
 matrix_go_skype_bridge_container_image_self_build_repo: "https://github.com/kelaresg/go-skype-bridge.git"
 matrix_go_skype_bridge_container_image_self_build_branch: "{{ 'master' if matrix_go_skype_bridge_version == 'latest' else matrix_go_skype_bridge_version }}"