diff --git a/roles/matrix-dendrite/defaults/main.yml b/roles/matrix-dendrite/defaults/main.yml
index b79b99dad..0067eb79a 100644
--- a/roles/matrix-dendrite/defaults/main.yml
+++ b/roles/matrix-dendrite/defaults/main.yml
@@ -43,6 +43,7 @@ matrix_dendrite_container_http_host_bind_address: ""
 matrix_dendrite_container_https_host_bind_address: ""
 
 # A list of extra arguments to pass to the container (`docker run` command)
+# Also see `matrix_dendrite_container_arguments`
 matrix_dendrite_container_extra_arguments: []
 
 # matrix_dendrite_container_runtime_injected_arguments is a list of extra arguments to pass to the container.
@@ -114,6 +115,7 @@ matrix_dendrite_container_additional_volumes: []
 # A list of appservice config files (in-container filesystem paths).
 # This list gets populated dynamically based on Dendrite extensions that have been enabled.
 # You may wish to use this together with `matrix_dendrite_container_additional_volumes` or `matrix_dendrite_container_extra_arguments`.
+# Also see `matrix_dendrite_app_service_config_files_final`
 matrix_dendrite_app_service_config_files: []
 
 # matrix_dendrite_app_service_runtime_injected_config_files is a list of appservice config files.
@@ -121,10 +123,10 @@ matrix_dendrite_app_service_config_files: []
 # If you'd like to inject your own arguments, see `matrix_dendrite_app_service_config_files`.
 matrix_dendrite_app_service_runtime_injected_config_files: []
 
-# matrix_dendrite_config_files holds the final list of config files to pass to the container.
+# matrix_dendrite_app_service_config_files_final holds the final list of config files to pass to the container.
 # You're not meant to override this variable.
 # If you'd like to inject your own arguments, see `matrix_dendrite_app_service_config_files`.
-matrix_dendrite_config_files: "{{ matrix_dendrite_app_service_config_files + matrix_dendrite_app_service_runtime_injected_config_files }}"
+matrix_dendrite_app_service_config_files_final: "{{ matrix_dendrite_app_service_config_files + matrix_dendrite_app_service_runtime_injected_config_files }}"
 
 # Enable exposure of metrics
 matrix_dendrite_metrics_enabled: false
diff --git a/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2 b/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2
index f34ae8de2..20131c106 100644
--- a/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2
+++ b/roles/matrix-dendrite/templates/dendrite/dendrite.yaml.j2
@@ -145,7 +145,7 @@ app_service_api:
   disable_tls_validation: {{ matrix_dendrite_disable_tls_validation|to_json }}
 
   # Appservice configuration files to load into this homeserver.
-  config_files: {{ matrix_dendrite_config_files|to_json }}
+  config_files: {{ matrix_dendrite_app_service_config_files_final|to_json }}
 
 # Configuration for the Client API.
 client_api:
diff --git a/roles/matrix-synapse/defaults/main.yml b/roles/matrix-synapse/defaults/main.yml
index a719aadec..6d204b174 100644
--- a/roles/matrix-synapse/defaults/main.yml
+++ b/roles/matrix-synapse/defaults/main.yml
@@ -61,6 +61,7 @@ matrix_synapse_container_metrics_api_host_bind_port: ''
 matrix_synapse_container_manhole_api_host_bind_port: ''
 
 # A list of extra arguments to pass to the container
+# Also see `matrix_synapse_container_arguments`
 matrix_synapse_container_extra_arguments: []
 
 # matrix_synapse_container_runtime_injected_arguments is a list of extra arguments to pass to the container.
@@ -334,6 +335,7 @@ matrix_synapse_additional_loggers: []
 # A list of appservice config files (in-container filesystem paths).
 # This list gets populated dynamically based on Synapse extensions that have been enabled.
 # You may wish to use this together with `matrix_synapse_container_additional_volumes` or `matrix_synapse_container_extra_arguments`.
+# Also see `matrix_synapse_app_service_config_files_final`
 matrix_synapse_app_service_config_files: []
 
 # matrix_synapse_app_service_runtime_injected_config_files is a list of appservice config files.
@@ -341,10 +343,10 @@ matrix_synapse_app_service_config_files: []
 # If you'd like to inject your own arguments, see `matrix_synapse_app_service_config_files`.
 matrix_synapse_app_service_runtime_injected_config_files: []
 
-# matrix_synapse_config_files holds the final list of config files to pass to the container.
+# matrix_synapse_app_service_config_files_final holds the final list of config files to pass to the container.
 # You're not meant to override this variable.
 # If you'd like to inject your own arguments, see `matrix_synapse_app_service_config_files`.
-matrix_synapse_config_files: "{{ matrix_synapse_app_service_config_files + matrix_synapse_app_service_runtime_injected_config_files }}"
+matrix_synapse_app_service_config_files_final: "{{ matrix_synapse_app_service_config_files + matrix_synapse_app_service_runtime_injected_config_files }}"
 
 # This is set dynamically during execution depending on whether
 # any password providers have been enabled or not.
diff --git a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2 b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
index 915d41db9..07c5ec89d 100644
--- a/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
+++ b/roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
@@ -1647,7 +1647,7 @@ room_prejoin_state:
 
 # A list of application service config files to use
 #
-app_service_config_files: {{ matrix_synapse_config_files|to_json }}
+app_service_config_files: {{ matrix_synapse_app_service_config_files_final|to_json }}
 
 # Uncomment to enable tracking of application service IP addresses. Implicitly
 # enables MAU tracking for application service users.