diff --git a/roles/matrix-bot-maubot/defaults/main.yml b/roles/matrix-bot-maubot/defaults/main.yml
index 7c5cb0eb6..57c3f5f7d 100644
--- a/roles/matrix-bot-maubot/defaults/main.yml
+++ b/roles/matrix-bot-maubot/defaults/main.yml
@@ -29,7 +29,13 @@ matrix_bot_maubot_database_hostname: 'matrix-postgres'
 matrix_bot_maubot_database_port: 5432
 matrix_bot_maubot_database_name: matrix_bot_maubot
 
-matrix_bot_maubot_database_connection_string: 'postgres://{{ matrix_bot_maubot_database_username }}:{{ matrix_bot_maubot_database_password }}@{{ matrix_bot_maubot_database_hostname }}:{{ matrix_bot_maubot_database_port }}/{{ matrix_bot_maubot_database_name }}?sslmode=disable'
+matrix_bot_maubot_database_connection_string: >
+  postgres://{{ matrix_bot_maubot_database_username }}
+  :{{ matrix_bot_maubot_database_password }}
+  @{{ matrix_bot_maubot_database_hostname }}
+  :{{ matrix_bot_maubot_database_port }}
+  /{{ matrix_bot_maubot_database_name }}
+  ?sslmode=disable'
 
 matrix_bot_maubot_database_uri: "{{
  	{
diff --git a/roles/matrix-bot-maubot/tasks/init.yml b/roles/matrix-bot-maubot/tasks/init.yml
index fe33da9b6..54fd714b5 100644
--- a/roles/matrix-bot-maubot/tasks/init.yml
+++ b/roles/matrix-bot-maubot/tasks/init.yml
@@ -1,10 +1,12 @@
 ---
 
-- ansible.builtin.set_fact:
+- name: Add maubot to the systemd service list
+  ansible.builtin.set_fact:
     matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-bot-maubot.service'] }}"
   when: matrix_bot_maubot_enabled|bool
 
-- block:
+- name: Configure nginx for maubot
+  block:
     - name: Generate Maubot proxying configuration for matrix-nginx-proxy
       ansible.builtin.set_fact:
         matrix_bot_maubot_matrix_nginx_proxy_configuration: |