diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index b4fef1dd..c2a81c29 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -66,3 +66,7 @@ run_setup: true
 run_self_check: true
 run_start: true
 run_stop: true
+
+# Building every docker image from source on the target host
+# Controlling docker image build is possible on a per unit base
+matrix_container_images_self_build: false
\ No newline at end of file
diff --git a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
index 0f3b14c5..89eea352 100644
--- a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
@@ -2,7 +2,7 @@
 # See: https://github.com/tulir/mautrix-hangouts
 
 matrix_mautrix_hangouts_enabled: true
-matrix_mautrix_hangouts_self_build: true
+matrix_mautrix_hangouts_self_build: "{{ matrix_container_images_self_build }}"
 
 # See: https://mau.dev/tulir/mautrix-hangouts/container_registry
 matrix_mautrix_hangouts_docker_image: "dock.mau.dev/tulir/mautrix-hangouts:latest"
diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml
index a8b71bcb..214401b8 100644
--- a/roles/matrix-coturn/defaults/main.yml
+++ b/roles/matrix-coturn/defaults/main.yml
@@ -1,5 +1,5 @@
 matrix_coturn_enabled: true
-matrix_coturn_self_build: false
+matrix_coturn_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_coturn_docker_image: "instrumentisto/coturn:4.5.1.1"
 matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-mxisd/defaults/main.yml b/roles/matrix-mxisd/defaults/main.yml
index b3a921bb..e882bc13 100644
--- a/roles/matrix-mxisd/defaults/main.yml
+++ b/roles/matrix-mxisd/defaults/main.yml
@@ -2,7 +2,7 @@
 # See: https://github.com/kamax-matrix/mxisd
 
 matrix_mxisd_enabled: true
-matrix_mxisd_self_build: false
+matrix_mxisd_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_mxisd_docker_image: "kamax/mxisd:1.4.6"
 matrix_mxisd_docker_image_force_pull: "{{ matrix_mxisd_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index bdbce0f3..efccdf21 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -1,5 +1,5 @@
 matrix_riot_web_enabled: true
-matrix_riot_web_self_build: false
+matrix_riot_web_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_riot_web_docker_image: "vectorim/riot-web:v1.5.12"
 matrix_riot_web_docker_image_force_pull: "{{ matrix_riot_web_docker_image.endswith(':latest') }}"
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 1f0d49d8..1a992a97 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -2,7 +2,7 @@
 # See: https://github.com/matrix-org/synapse
 
 matrix_synapse_enabled: true
-matrix_synapse_self_build: false
+matrix_synapse_self_build: "{{ matrix_container_images_self_build }}"
 
 matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.1"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"