diff --git a/roles/custom/matrix-jitsi/defaults/main.yml b/roles/custom/matrix-jitsi/defaults/main.yml
index 25a0e9b2d..66d06e3b7 100644
--- a/roles/custom/matrix-jitsi/defaults/main.yml
+++ b/roles/custom/matrix-jitsi/defaults/main.yml
@@ -54,7 +54,7 @@ matrix_jitsi_ldap_start_tls: false
 # Auth type: matrix
 matrix_jitsi_prosody_auth_matrix_user_verification_repo_location: "https://github.com/matrix-org/prosody-mod-auth-matrix-user-verification"
 matrix_jitsi_prosody_auth_matrix_user_verification_repo_target: "{{ matrix_jitsi_prosody_ext_path }}/prosody_auth_matrix_user_verification"
-matrix_jitsi_prosody_auth_matrix_user_verification_repo_version: "2839499cb03894d8cfc3e5b2219441427cb133d8" # v1.8.0
+matrix_jitsi_prosody_auth_matrix_user_verification_repo_version: "2839499cb03894d8cfc3e5b2219441427cb133d8"  # v1.8.0
 matrix_jitsi_prosody_auth_matrix_uvs_sync_power_levels: true
 matrix_jitsi_prosody_auth_matrix_uvs_location: ""
 # Should match domain, see https://github.com/vector-im/element-web/pull/15114/commits/0410a6b3be82a41457275e4d1ce879dea146e092
diff --git a/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_auth_uvs_install.yml b/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_auth_uvs_install.yml
index 36f334253..f1d9ff210 100644
--- a/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_auth_uvs_install.yml
+++ b/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_auth_uvs_install.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Checkout Prosody Auth Matrix User Verification Plugin Repo
   ansible.builtin.git:
     repo: "{{ matrix_jitsi_prosody_auth_matrix_user_verification_repo_location }}"
@@ -6,7 +8,7 @@
 
 - name: Install Prosody Auth Matrix User Verification Plugin
   ansible.builtin.copy:
-    remote_src: yes
+    remote_src: true
     src: "{{ matrix_jitsi_prosody_auth_matrix_user_verification_repo_target }}/{{ item.path }}"
     dest: "{{ matrix_jitsi_prosody_plugins_path }}/{{ item.path }}"
   with_items: "{{ matrix_jitsi_prosody_auth_matrix_files }}"
diff --git a/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_auth_uvs_uninstall.yml b/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_auth_uvs_uninstall.yml
index 2ba793eca..229ce896e 100644
--- a/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_auth_uvs_uninstall.yml
+++ b/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_auth_uvs_uninstall.yml
@@ -1,3 +1,5 @@
+---
+
 - name: Remove all files regarding prosody mod auth_matrix_user_verification and .well-known/element/jitsi
   ansible.builtin.file:
     path: "{{ item }}"
@@ -11,10 +13,10 @@
 - name: Remove .well-known/element directory if empty
   ansible.builtin.command:
     argv:
-     - rmdir
-     - "{{ matrix_static_files_base_path }}/.well-known/element"
+      - rmdir
+      - "{{ matrix_static_files_base_path }}/.well-known/element"
     removes: "{{matrix_static_files_base_path}}/.well-known/element"
-  ignore_errors: yes
+  ignore_errors: true
 
 - when: matrix_jitsi_prosody_auth_matrix_user_verification_uninstalled.changed
   block:
diff --git a/roles/custom/matrix-jitsi/tasks/validate_config.yml b/roles/custom/matrix-jitsi/tasks/validate_config.yml
index 5975a605b..f975e4ac9 100644
--- a/roles/custom/matrix-jitsi/tasks/validate_config.yml
+++ b/roles/custom/matrix-jitsi/tasks/validate_config.yml
@@ -45,7 +45,6 @@
       or (matrix_jitsi_auth_type == 'matrix' and matrix_jitsi_prosody_auth_matrix_uvs_auth_token|length == 0))
 
 
-
 - name: (Deprecation) Catch and report renamed settings
   ansible.builtin.fail:
     msg: >-
diff --git a/roles/custom/matrix-user-verification-service/handlers/main.yml b/roles/custom/matrix-user-verification-service/handlers/main.yml
index a1ad1f31e..b9ee66d73 100644
--- a/roles/custom/matrix-user-verification-service/handlers/main.yml
+++ b/roles/custom/matrix-user-verification-service/handlers/main.yml
@@ -2,5 +2,5 @@
 
 - name: Ensure systemd reloaded after matrix-user-verification-service.service installation
   service:
-    daemon_reload: yes
+    daemon_reload: true
   listen: "reload matrix-user-verification-service"
diff --git a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml
index 24b8b811a..d095c4101 100644
--- a/roles/custom/matrix-user-verification-service/tasks/setup_install.yml
+++ b/roles/custom/matrix-user-verification-service/tasks/setup_install.yml
@@ -8,7 +8,7 @@
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
   with_items:
-    - { path: "{{ matrix_user_verification_service_config_path }}", when: true }
+    - {path: "{{ matrix_user_verification_service_config_path }}", when: true}
   when: item.when | bool
 
 - name: Ensure Matrix User Verification Service image is pulled
diff --git a/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml b/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml
index 5daafd3d8..bc09f7ef2 100644
--- a/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml
+++ b/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml
@@ -11,7 +11,7 @@
       service:
         name: "{{ matrix_user_verification_service_systemd_service_basename }}"
         state: stopped
-        daemon_reload: yes
+        daemon_reload: true
       register: stopping_result
 
     - name: Ensure matrix-user-verification-service.service doesn't exist