diff --git a/roles/custom/matrix-element-call/defaults/main.yml b/roles/custom/matrix-element-call/defaults/main.yml
index 55ded89ea..1249f55cf 100644
--- a/roles/custom/matrix-element-call/defaults/main.yml
+++ b/roles/custom/matrix-element-call/defaults/main.yml
@@ -77,9 +77,6 @@ matrix_element_call_container_labels_additional_labels: ''
 # A list of extra arguments to pass to the container
 matrix_element_call_container_extra_arguments: []
 
-# Additional environment variables for the container
-matrix_element_call_environment_variables_additional: {}
-
 # List of systemd services that matrix-element-call.service depends on
 matrix_element_call_systemd_required_services_list: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"
 
diff --git a/roles/custom/matrix-livekit-jwt-service/defaults/main.yml b/roles/custom/matrix-livekit-jwt-service/defaults/main.yml
index 1a5fce14f..8277b75cb 100644
--- a/roles/custom/matrix-livekit-jwt-service/defaults/main.yml
+++ b/roles/custom/matrix-livekit-jwt-service/defaults/main.yml
@@ -80,8 +80,14 @@ matrix_livekit_jwt_service_environment_variable_livekit_url: ""
 # Controls the LIVEKIT_SECRET environment variable
 matrix_livekit_jwt_service_environment_variable_livekit_secret: ""
 
-# Additional environment variables for the container
-matrix_livekit_jwt_service_environment_variables_additional: {}
+# Additional environment variables to pass to the container.
+#
+# Environment variables take priority over settings in the configuration file.
+#
+# Example:
+# matrix_livekit_jwt_service_environment_variables_extension: |
+#   KEY=value
+matrix_livekit_jwt_service_environment_variables_extension: ''
 
 # List of systemd services that LiveKit JWT Service service depends on
 matrix_livekit_jwt_service_systemd_required_services_list: "{{ matrix_livekit_jwt_service_systemd_required_services_list_default + matrix_livekit_jwt_service_systemd_required_services_list_auto + matrix_livekit_jwt_service_systemd_required_services_list_custom }}"
diff --git a/roles/custom/matrix-livekit-jwt-service/templates/env.j2 b/roles/custom/matrix-livekit-jwt-service/templates/env.j2
index 9703e897e..c32da08ef 100644
--- a/roles/custom/matrix-livekit-jwt-service/templates/env.j2
+++ b/roles/custom/matrix-livekit-jwt-service/templates/env.j2
@@ -11,4 +11,4 @@ LIVEKIT_KEY={{ matrix_livekit_jwt_service_environment_variable_livekit_key }}
 LIVEKIT_URL={{ matrix_livekit_jwt_service_environment_variable_livekit_url }}
 LIVEKIT_SECRET={{ matrix_livekit_jwt_service_environment_variable_livekit_secret }}
 
-{{ matrix_livekit_jwt_service_environment_variables_additional }}
+{{ matrix_livekit_jwt_service_environment_variables_extension }}
diff --git a/roles/custom/matrix-livekit-server/defaults/main.yml b/roles/custom/matrix-livekit-server/defaults/main.yml
index 09800d68b..6dfa1eb93 100644
--- a/roles/custom/matrix-livekit-server/defaults/main.yml
+++ b/roles/custom/matrix-livekit-server/defaults/main.yml
@@ -93,9 +93,6 @@ livekit_server_container_labels_additional_labels: ''
 # A list of extra arguments to pass to the container
 livekit_server_container_extra_arguments: []
 
-# Additional environment variables for the container
-livekit_server_environment_variables_additional: {}
-
 # List of systemd services that LiveKit Server service depends on
 livekit_server_systemd_required_services_list: "{{ livekit_server_systemd_required_services_list_default + livekit_server_systemd_required_services_list_auto + livekit_server_systemd_required_services_list_custom }}"
 livekit_server_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}"