diff --git a/roles/matrix-bot-maubot/tasks/init.yml b/roles/matrix-bot-maubot/tasks/init.yml
index 001a3c477..251d0b4a2 100644
--- a/roles/matrix-bot-maubot/tasks/init.yml
+++ b/roles/matrix-bot-maubot/tasks/init.yml
@@ -14,7 +14,7 @@
           {% if matrix_nginx_proxy_enabled | default(False) %}
             {# Use the embedded DNS resolver in Docker containers to discover the service #}
              resolver 127.0.0.11 valid=5s;
-             set $backend "matrix-bot-maubot:29316/$1";
+             set $backend "matrix-bot-maubot:{{ matrix_bot_maubot_management_interface_port }}/$1";
              proxy_pass http://$backend;
              proxy_set_header Upgrade $http_upgrade;
              proxy_set_header Connection "upgrade";
diff --git a/roles/matrix-bot-maubot/templates/config/config.yaml.j2 b/roles/matrix-bot-maubot/templates/config/config.yaml.j2
index 041522f82..938901eab 100644
--- a/roles/matrix-bot-maubot/templates/config/config.yaml.j2
+++ b/roles/matrix-bot-maubot/templates/config/config.yaml.j2
@@ -32,7 +32,7 @@ plugin_databases:
 server:
     # The IP and port to listen to.
     hostname: 0.0.0.0
-    port: 29316
+    port: {{ matrix_bot_maubot_management_interface_port|to_json }}
     # Public base URL where the server is visible.
     public_url: {{ matrix_bot_maubot_bot_server_public_url|to_json }}
     # The base management API path.
diff --git a/roles/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2 b/roles/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2
index 8957da5e5..2773c69db 100644
--- a/roles/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2
+++ b/roles/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2
@@ -28,7 +28,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-maubot \
 			{% endfor %}
 			--network={{ matrix_docker_network }} \
 			{% if matrix_bot_maubot_management_interface_http_bind_port %}
-			-p {{ matrix_bot_maubot_management_interface_http_bind_port }}:29316
+			-p {{ matrix_bot_maubot_management_interface_http_bind_port }}:{{ matrix_bot_maubot_management_interface_port }}
 			{% endif %}
 			{{ matrix_bot_maubot_docker_image }} \
  			python3 -m maubot -c /config/config.yaml