diff --git a/roles/custom/matrix-authentication-service/defaults/main.yml b/roles/custom/matrix-authentication-service/defaults/main.yml
index c0f99dadc..e6f9e09de 100644
--- a/roles/custom/matrix-authentication-service/defaults/main.yml
+++ b/roles/custom/matrix-authentication-service/defaults/main.yml
@@ -593,4 +593,3 @@ matrix_authentication_service_migration_in_progress: false
 # /Misc                                                                                #
 #                                                                                      #
 ########################################################################################
-
diff --git a/roles/custom/matrix-authentication-service/tasks/mas_cli_doctor.yml b/roles/custom/matrix-authentication-service/tasks/mas_cli_doctor.yml
index 591b80803..96689d6e2 100644
--- a/roles/custom/matrix-authentication-service/tasks/mas_cli_doctor.yml
+++ b/roles/custom/matrix-authentication-service/tasks/mas_cli_doctor.yml
@@ -7,8 +7,8 @@
     daemon_reload: true
   register: matrix_authentication_service_mas_ensure_started_result
 
-- when: matrix_authentication_service_mas_ensure_started_result.changed | bool
-  name: Wait a bit, so that Matrix Authentication Service can start
+- name: Wait a bit, so that Matrix Authentication Service can start
+  when: matrix_authentication_service_mas_ensure_started_result.changed | bool
   ansible.builtin.wait_for:
     timeout: "{{ matrix_authentication_service_syn2mas_start_wait_time_seconds }}"
   delegate_to: 127.0.0.1
diff --git a/roles/custom/matrix-authentication-service/tasks/syn2mas.yml b/roles/custom/matrix-authentication-service/tasks/syn2mas.yml
index dd1c2f9c6..7887821a4 100644
--- a/roles/custom/matrix-authentication-service/tasks/syn2mas.yml
+++ b/roles/custom/matrix-authentication-service/tasks/syn2mas.yml
@@ -1,6 +1,6 @@
 ---
 
-- set_fact:
+- ansible.builtin.set_fact:
     matrix_authentication_service_syn2mas_dry_run: "{{ matrix_authentication_service_syn2mas_dry_run | bool }}"
 
 - name: Abort, if not using Synapse
@@ -124,14 +124,14 @@
   ansible.builtin.debug:
     var: matrix_authentication_service_syn2mas_migration_command_result
 
-- when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_synapse_ensure_stopped_result.changed"
-  name: Ensure Synapse is started (if it previously was)
+- name: Ensure Synapse is started (if it previously was)
+  when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_synapse_ensure_stopped_result.changed"
   ansible.builtin.service:
     name: matrix-synapse
     state: started
 
-- when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_mas_ensure_stopped_result.changed"
-  name: Ensure Matrix Authentication Service is started (if it previously was)
+- name: Ensure Matrix Authentication Service is started (if it previously was)
+  when: "not matrix_authentication_service_syn2mas_dry_run and matrix_authentication_service_mas_ensure_stopped_result.changed"
   ansible.builtin.service:
     name: matrix-authentication-service
     state: started
diff --git a/roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml b/roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml
index 54e872ea3..79fdc2e73 100644
--- a/roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml
+++ b/roles/custom/matrix-authentication-service/tasks/util/prepare_key.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Prepare Matrix Authentication Service private key file path ({{ private_key_definition.key_file }})
   ansible.builtin.set_fact:
     matrix_authentication_service_private_key_file_path: "{{ matrix_authentication_service_data_keys_path }}/{{ private_key_definition.key_file }}"