diff --git a/roles/custom/matrix-client-element/defaults/main.yml b/roles/custom/matrix-client-element/defaults/main.yml
index 28309355e..c38ae8649 100644
--- a/roles/custom/matrix-client-element/defaults/main.yml
+++ b/roles/custom/matrix-client-element/defaults/main.yml
@@ -349,3 +349,15 @@ matrix_client_element_location_sharing_map_style_content_sources_localsource_att
 # Optional URL to redirect the user to after they have logged out.
 # See https://github.com/element-hq/element-web/blob/develop/docs/config.md#sso-setup
 matrix_client_element_logout_redirect_url: ''
+
+# Controls the `ELEMENT_WEB_PORT` environment variable.
+matrix_client_element_environment_variable_element_web_port: "{{ matrix_client_element_container_port }}"
+
+# Additional environment variables to pass to the container.
+#
+# Environment variables take priority over settings in the configuration file.
+#
+# Example:
+# matrix_client_element_environment_variables_extension: |
+#   ELEMENT_WEB_PORT=8080
+matrix_client_element_environment_variables_extension: ''
\ No newline at end of file
diff --git a/roles/custom/matrix-client-element/templates/env.j2 b/roles/custom/matrix-client-element/templates/env.j2
index a142b6205..152f7cc30 100644
--- a/roles/custom/matrix-client-element/templates/env.j2
+++ b/roles/custom/matrix-client-element/templates/env.j2
@@ -1 +1,3 @@
-ELEMENT_WEB_PORT={{ matrix_client_element_container_port }}
+ELEMENT_WEB_PORT={{ matrix_client_element_environment_variable_element_web_port }}
+
+{{ matrix_client_element_environment_variables_extension }}