diff --git a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
index 6503a275..93a3134b 100644
--- a/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-facebook/defaults/main.yml
@@ -11,7 +11,7 @@ matrix_mautrix_facebook_docker_image_force_pull: "{{ matrix_mautrix_facebook_doc
 matrix_mautrix_facebook_base_path: "{{ matrix_base_data_path }}/mautrix-facebook"
 matrix_mautrix_facebook_config_path: "{{ matrix_mautrix_facebook_base_path }}/config"
 matrix_mautrix_facebook_data_path: "{{ matrix_mautrix_facebook_base_path }}/data"
-matrix_docker_mautrix_facebook_src_files_path: "{{ matrix_mautrix_facebook_base_path }}/docker-src"
+matrix_mautrix_facebook_docker_src_files_path: "{{ matrix_mautrix_facebook_base_path }}/docker-src"
 
 matrix_mautrix_facebook_homeserver_address: 'http://matrix-synapse:8008'
 matrix_mautrix_facebook_homeserver_domain: '{{ matrix_domain }}'
diff --git a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
index 7b83ae4e..1088f0b4 100644
--- a/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-facebook/tasks/setup_install.yml
@@ -27,12 +27,12 @@
     - "{{ matrix_mautrix_facebook_base_path }}"
     - "{{ matrix_mautrix_facebook_config_path }}"
     - "{{ matrix_mautrix_facebook_data_path }}"
-    - { src: "{{ matrix_docker_mautrix_facebook_src_files_path }}", when: "{{ matrix_mautrix_facebook_self_build }}" }
+    - { src: "{{ matrix_mautrix_facebook_docker_src_files_path }}", when: "{{ matrix_mautrix_facebook_self_build }}" }
 
 - name: Ensure Mautrix Facebook repository is present on self-build
   git:
     repo: https://github.com/tulir/mautrix-facebook.git
-    dest: "{{ matrix_docker_mautrix_facebook_src_files_path }}"
+    dest: "{{ matrix_mautrix_facebook_docker_src_files_path }}"
 #    version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_self_build"
@@ -43,7 +43,7 @@
     source: build
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_docker_mautrix_facebook_src_files_path }}"
+      path: "{{ matrix_mautrix_facebook_docker_src_files_path }}"
       pull: yes
   when: "matrix_mautrix_facebook_enabled|bool and matrix_mautrix_facebook_self_build"
 
diff --git a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
index e136dd1e..0f3b14c5 100644
--- a/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/defaults/main.yml
@@ -11,7 +11,7 @@ matrix_mautrix_hangouts_docker_image_force_pull: "{{ matrix_mautrix_hangouts_doc
 matrix_mautrix_hangouts_base_path: "{{ matrix_base_data_path }}/mautrix-hangouts"
 matrix_mautrix_hangouts_config_path: "{{ matrix_mautrix_hangouts_base_path }}/config"
 matrix_mautrix_hangouts_data_path: "{{ matrix_mautrix_hangouts_base_path }}/data"
-matrix_docker_mautrix_hangouts_src_files_path: "{{ matrix_mautrix_hangouts_base_path }}/docker-src"
+matrix_mautrix_hangouts_docker_src_files_path: "{{ matrix_mautrix_hangouts_base_path }}/docker-src"
 
 matrix_mautrix_hangouts_public_endpoint: '/mautrix-hangouts'
 
diff --git a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
index 4a5c9103..e18778b2 100644
--- a/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
+++ b/roles/matrix-bridge-mautrix-hangouts/tasks/setup_install.yml
@@ -27,14 +27,14 @@
     - "{{ matrix_mautrix_hangouts_base_path }}"
     - "{{ matrix_mautrix_hangouts_config_path }}"
     - "{{ matrix_mautrix_hangouts_data_path }}"
-    - { src: "{{ matrix_docker_mautrix_hangouts_src_files_path }}", when: "{{ matrix_mautrix_hangouts_self_build }}" }
+    - { src: "{{ matrix_mautrix_hangouts_docker_src_files_path }}", when: "{{ matrix_mautrix_hangouts_self_build }}" }
 
   when: matrix_mautrix_hangouts_enabled|bool and not matrix_mautrix_hangouts_self_build
 
 - name: Ensure Mautrix Hangots repository is present on self build
   git:
     repo: https://github.com/tulir/mautrix-hangouts.git
-    dest: "{{ matrix_docker_mautrix_hangouts_src_files_path }}"
+    dest: "{{ matrix_mautrix_hangouts_docker_src_files_path }}"
     force: "yes"
   when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_self_build"
 
@@ -44,7 +44,7 @@
     source: build
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_docker_mautrix_hangouts_src_files_path }}"
+      path: "{{ matrix_mautrix_hangouts_docker_src_files_path }}"
       pull: yes
   when: "matrix_mautrix_hangouts_enabled|bool and matrix_mautrix_hangouts_self_build"
 
diff --git a/roles/matrix-coturn/defaults/main.yml b/roles/matrix-coturn/defaults/main.yml
index c6a02184..a8b71bcb 100644
--- a/roles/matrix-coturn/defaults/main.yml
+++ b/roles/matrix-coturn/defaults/main.yml
@@ -14,7 +14,7 @@ matrix_coturn_docker_image_force_pull: "{{ matrix_coturn_docker_image.endswith('
 matrix_coturn_docker_network: "matrix-coturn"
 
 matrix_coturn_base_path: "{{ matrix_base_data_path }}/coturn"
-matrix_docker_coturn_src_files_path: "{{ matrix_coturn_base_path }}/docker-src"
+matrix_coturn_docker_src_files_path: "{{ matrix_coturn_base_path }}/docker-src"
 matrix_coturn_config_path: "{{ matrix_coturn_base_path }}/turnserver.conf"
 
 # List of systemd services that matrix-coturn.service depends on
diff --git a/roles/matrix-coturn/tasks/setup_coturn.yml b/roles/matrix-coturn/tasks/setup_coturn.yml
index 9a50859a..ec7a452e 100644
--- a/roles/matrix-coturn/tasks/setup_coturn.yml
+++ b/roles/matrix-coturn/tasks/setup_coturn.yml
@@ -12,7 +12,7 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_username }}"
   with_items:
-    - { src: "{{ matrix_docker_coturn_src_files_path }}", when: "{{ matrix_coturn_self_build }}"}
+    - { src: "{{ matrix_coturn_docker_src_files_path }}", when: "{{ matrix_coturn_self_build }}"}
   when: matrix_riot_web_enabled|bool
 
 - name: Ensure Coturn image is pulled
@@ -26,7 +26,7 @@
 - name: Ensure Coturn repository is present on self-build
   git:
     repo: https://github.com/instrumentisto/coturn-docker-image.git
-    dest: "{{ matrix_docker_coturn_src_files_path }}"
+    dest: "{{ matrix_coturn_docker_src_files_path }}"
     version: "{{ matrix_coturn_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_coturn_enabled|bool and matrix_coturn_self_build"
@@ -37,7 +37,7 @@
     source: build
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_docker_coturn_src_files_path }}"
+      path: "{{ matrix_coturn_docker_src_files_path }}"
       pull: yes
   when: "matrix_coturn_enabled|bool and matrix_coturn_self_build"
 
diff --git a/roles/matrix-mxisd/defaults/main.yml b/roles/matrix-mxisd/defaults/main.yml
index b9bebb0b..b3a921bb 100644
--- a/roles/matrix-mxisd/defaults/main.yml
+++ b/roles/matrix-mxisd/defaults/main.yml
@@ -8,7 +8,7 @@ matrix_mxisd_docker_image: "kamax/mxisd:1.4.6"
 matrix_mxisd_docker_image_force_pull: "{{ matrix_mxisd_docker_image.endswith(':latest') }}"
 
 matrix_mxisd_base_path: "{{ matrix_base_data_path }}/mxisd"
-matrix_docker_mxisd_src_files_path: "{{ matrix_mxisd_base_path }}/docker-src"
+matrix_mxisd_docker_src_files_path: "{{ matrix_mxisd_base_path }}/docker-src"
 matrix_mxisd_config_path: "{{ matrix_mxisd_base_path }}/config"
 matrix_mxisd_data_path: "{{ matrix_mxisd_base_path }}/data"
 
diff --git a/roles/matrix-mxisd/tasks/setup_mxisd.yml b/roles/matrix-mxisd/tasks/setup_mxisd.yml
index b01abef3..92b7163b 100644
--- a/roles/matrix-mxisd/tasks/setup_mxisd.yml
+++ b/roles/matrix-mxisd/tasks/setup_mxisd.yml
@@ -14,7 +14,7 @@
   with_items:
     - "{{ matrix_mxisd_config_path }}"
     - "{{ matrix_mxisd_data_path }}"
-    - { src: "{{ matrix_docker_mxisd_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
+    - { src: "{{ matrix_mxisd_docker_src_files_path }}", when: "{{ matrix_mxisd_self_build }}"}
   when: matrix_mxisd_enabled|bool
 
 - name: Ensure mxisd image is pulled
@@ -36,7 +36,7 @@
 - name: Ensure mxisd repository is present on self-build
   git:
     repo: https://github.com/kamax-matrix/mxisd.git
-    dest: "{{ matrix_docker_mxisd_src_files_path }}"
+    dest: "{{ matrix_mxisd_docker_src_files_path }}"
     version: "v{{ matrix_mxisd_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
@@ -44,7 +44,7 @@
 - name: Ensure mxisd Docker image is build
   shell: "./gradlew dockerBuild"
   args:
-    chdir: "{{ matrix_docker_mxisd_src_files_path }}"
+    chdir: "{{ matrix_mxisd_docker_src_files_path }}"
   when: "matrix_mxisd_enabled|bool and matrix_mxisd_self_build"
 
 - name: Ensure mxisd config installed
diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index 0a37c965..bdbce0f3 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -5,7 +5,7 @@ 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') }}"
 
 matrix_riot_web_data_path: "{{ matrix_base_data_path }}/riot-web"
-matrix_docker_riot_web_src_files_path: "{{ matrix_riot_web_data_path }}/docker-src"
+matrix_riot_web_docker_src_files_path: "{{ matrix_riot_web_data_path }}/docker-src"
 
 # Controls whether the matrix-riot-web container exposes its HTTP port (tcp/8080 in the container).
 #
diff --git a/roles/matrix-riot-web/tasks/setup_riot_web.yml b/roles/matrix-riot-web/tasks/setup_riot_web.yml
index ef0ec91d..9161c817 100644
--- a/roles/matrix-riot-web/tasks/setup_riot_web.yml
+++ b/roles/matrix-riot-web/tasks/setup_riot_web.yml
@@ -13,7 +13,7 @@
     group: "{{ matrix_user_username }}"
   with_items:
     - "{{ matrix_riot_web_data_path }}"
-    - { src: "{{ matrix_docker_riot_web_src_files_path }}", when: "{{ matrix_riot_web_self_build }}" }
+    - { src: "{{ matrix_riot_web_docker_src_files_path }}", when: "{{ matrix_riot_web_self_build }}" }
   when: matrix_riot_web_enabled|bool
 
 - name: Ensure riot-web Docker image is pulled
@@ -27,7 +27,7 @@
 - name: Ensure Riot Web repository is present on self-build
   git:
     repo: https://github.com/vector-im/riot-web.git
-    dest: "{{ matrix_docker_riot_web_src_files_path }}"
+    dest: "{{ matrix_riot_web_docker_src_files_path }}"
     version: "v{{ matrix_riot_web_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_riot_web_enabled|bool and matrix_riot_web_self_build"
@@ -38,7 +38,7 @@
     source: build
     build:
       dockerfile: Dockerfile
-      path: "{{ matrix_docker_riot_web_src_files_path }}"
+      path: "{{ matrix_riot_web_docker_src_files_path }}"
       pull: yes
   when: "matrix_riot_web_enabled|bool and matrix_self_build"
 
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index 309d4396..1f0d49d8 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -8,7 +8,7 @@ matrix_synapse_docker_image: "matrixdotorg/synapse:v1.11.1"
 matrix_synapse_docker_image_force_pull: "{{ matrix_synapse_docker_image.endswith(':latest') }}"
 
 matrix_synapse_base_path: "{{ matrix_base_data_path }}/synapse"
-matrix_docker_synapse_src_files_path: "{{ matrix_synapse_base_path }}/docker-src"
+matrix_synapse_docker_src_files_path: "{{ matrix_synapse_base_path }}/docker-src"
 matrix_synapse_config_dir_path: "{{ matrix_synapse_base_path }}/config"
 matrix_synapse_run_path: "{{ matrix_synapse_base_path }}/run"
 matrix_synapse_storage_path: "{{ matrix_synapse_base_path }}/storage"
diff --git a/roles/matrix-synapse/tasks/setup_synapse.yml b/roles/matrix-synapse/tasks/setup_synapse.yml
index c5d6beef..0ce851c7 100644
--- a/roles/matrix-synapse/tasks/setup_synapse.yml
+++ b/roles/matrix-synapse/tasks/setup_synapse.yml
@@ -11,7 +11,7 @@
     - "{{ matrix_synapse_config_dir_path }}"
     - "{{ matrix_synapse_run_path }}"
     - "{{ matrix_synapse_ext_path }}"
-    - { src: "{{ matrix_docker_synapse_src_files_path }}", when: "{{ matrix_synapse_self_build }}" }
+    - { src: "{{ matrix_synapse_docker_src_files_path }}", when: "{{ matrix_synapse_self_build }}" }
     # We handle matrix_synapse_media_store_path elsewhere (in ./synapse/setup_install.yml),
     # because if it's using Goofys and it's already mounted (from before),
     # trying to chown/chmod it here will cause trouble.
diff --git a/roles/matrix-synapse/tasks/synapse/setup_install.yml b/roles/matrix-synapse/tasks/synapse/setup_install.yml
index 2188b1bd..481429a4 100644
--- a/roles/matrix-synapse/tasks/synapse/setup_install.yml
+++ b/roles/matrix-synapse/tasks/synapse/setup_install.yml
@@ -21,7 +21,7 @@
 - name: Ensure Synapse repository is present on self-build
   git:
     repo: https://github.com/matrix-org/synapse.git
-    dest: "{{ matrix_docker_synapse_src_files_path }}"
+    dest: "{{ matrix_synapse_docker_src_files_path }}"
     version: "{{ matrix_synapse_docker_image.split(':')[1] }}"
     force: "yes"
   when: "matrix_synapse_self_build"
@@ -32,7 +32,7 @@
     source: build
     build:
       dockerfile: docker/Dockerfile
-      path: "{{ matrix_docker_synapse_src_files_path }}"
+      path: "{{ matrix_synapse_docker_src_files_path }}"
       pull: yes
   when: "matrix_synapse_self_build"