diff --git a/roles/matrix-bot-maubot/defaults/main.yml b/roles/matrix-bot-maubot/defaults/main.yml
index 6e4219f56..dd777a7bd 100644
--- a/roles/matrix-bot-maubot/defaults/main.yml
+++ b/roles/matrix-bot-maubot/defaults/main.yml
@@ -13,7 +13,7 @@ matrix_bot_maubot_base_path: "{{ matrix_base_data_path }}/maubot"
 matrix_bot_maubot_data_path: "{{ matrix_bot_maubot_base_path }}/data"
 matrix_bot_maubot_config_path: "{{ matrix_bot_maubot_base_path }}/config"
 
-matrix_bot_maubot_bot_server: "https://{{ matrix_server_fqn_matrix }}"
+matrix_bot_maubot_bot_server_public: "https://{{ matrix_server_fqn_matrix }}"
 matrix_bot_maubot_proxy_management_interface: false
 matrix_bot_maubot_expose_management_interface: true
 
diff --git a/roles/matrix-bot-maubot/templates/config/config.yaml.j2 b/roles/matrix-bot-maubot/templates/config/config.yaml.j2
index 2797c03fe..298603404 100644
--- a/roles/matrix-bot-maubot/templates/config/config.yaml.j2
+++ b/roles/matrix-bot-maubot/templates/config/config.yaml.j2
@@ -50,7 +50,7 @@ server:
     hostname: 0.0.0.0
     port: 29316
     # Public base URL where the server is visible.
-    public_url: {{ matrix_bot_maubot_bot_server }}
+    public_url: {{ matrix_bot_maubot_bot_server_public }}
     # The base management API path.
     base_path: /_matrix/maubot/v1
     # The base path for the UI.
@@ -73,7 +73,7 @@ server:
 homeservers:
   {{  matrix_domain }}:
     # Client-server API URL
-        url: {{ matrix_bot_maubot_bot_server }}
+        url: {{ matrix_server_fqn_matrix }}
     # registration_shared_secret from synapse config
     # You can leave this empty if you don't have access to the homeserver.
     # When this is empty, `mbc auth --register` won't work, but `mbc auth` (login) will.