diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index c1ffd5a2a..999f6a534 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -1201,6 +1201,9 @@ matrix_bot_maubot_shared_secret: true
 matrix_bot_maubot_database_engine: "{{ 'postgres' if matrix_postgres_enabled else 'sqlite' }}"
 matrix_bot_maubot_database_password: "{{ matrix_synapse_macaroon_secret_key | password_hash('sha512', 'maubot.db') | to_uuid }}"
 
+matrix_bot_maubot_container_http_host_bind_port: "{{ '' if matrix_nginx_proxy_enabled else '127.0.0.1:'+matrix_bot_maubot_management_port|string }}"
+
+
 ######################################################################
 #
 # /matrix-bot-maubot
diff --git a/roles/matrix-bot-maubot/defaults/main.yml b/roles/matrix-bot-maubot/defaults/main.yml
index 4c4bf9469..4db616133 100644
--- a/roles/matrix-bot-maubot/defaults/main.yml
+++ b/roles/matrix-bot-maubot/defaults/main.yml
@@ -3,6 +3,7 @@ matrix_bot_maubot_host_data_dir: "{{ matrix_base_data_path }}/maubot/data"
 matrix_bot_maubot_host_config_dir: "{{ matrix_base_data_path }}/maubot/config"
 matrix_bot_maubot_container_data_dir: "/data"
 matrix_bot_maubot_container_config_dir: "/root/.config/"
+matrix_bot_maubot_container_http_host_bind_port: ''
 matrix_bot_maubot_config_filename: "config.yaml"
 matrix_bot_maubot_config_path: "{{ matrix_bot_maubot_host_data_dir + '/' + matrix_bot_maubot_config_filename }}"
 matrix_bot_maubot_systemd_required_services_list: ['docker.service']
diff --git a/roles/matrix-bot-maubot/templates/matrix-maubot.service.j2 b/roles/matrix-bot-maubot/templates/matrix-maubot.service.j2
index eaded23be..91932b9d2 100644
--- a/roles/matrix-bot-maubot/templates/matrix-maubot.service.j2
+++ b/roles/matrix-bot-maubot/templates/matrix-maubot.service.j2
@@ -22,7 +22,7 @@ ExecStart=/usr/bin/docker run --rm --name matrix-maubot \
                         -e UID={{ matrix_user_uid }} \
                         -e GID={{ matrix_user_gid }} \
 			--network={{ matrix_docker_network }} \
-                        -p 29316:29316 \
+                        -p {{ matrix_bot_maubot_container_http_host_bind_port }}:29316 \
 			-v {{ matrix_bot_maubot_host_data_dir }}:{{ matrix_bot_maubot_container_data_dir }}:z \
 			-v {{ matrix_bot_maubot_host_config_dir }}:{{ matrix_bot_maubot_container_config_dir }}:z \
 			{% for arg in matrix_bot_maubot_container_extra_arguments %}