diff --git a/roles/custom/matrix-jitsi/tasks/self_check_matrix_auth.yml b/roles/custom/matrix-jitsi/tasks/self_check_matrix_auth.yml
index 68a28ef7..52d865c5 100644
--- a/roles/custom/matrix-jitsi/tasks/self_check_matrix_auth.yml
+++ b/roles/custom/matrix-jitsi/tasks/self_check_matrix_auth.yml
@@ -48,6 +48,7 @@
       - "--quiet"
       - "{{ matrix_jitsi_prosody_self_check_uvs_health_url | quote }}"
   register: matrix_jitsi_prosody_self_check_uvs_result
+  changed_when: false
   ignore_errors: true
 
 - name: Fail if user verification service is not (reachable and healthy)
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 5c742566..2559c7e6 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
@@ -16,5 +16,5 @@
       ansible.builtin.service_facts:
 
     - name: Ensure prosody is restarted later on if currently running
-      set_fact:
+      ansible.builtin.set_fact:
         matrix_jitsi_prosody_require_restart: "{{ true if ansible_facts.services['matrix-jitsi-prosody.service']['state'] == 'running' else false }}"
diff --git a/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_prosody_post_setup_hooks.yml b/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_prosody_post_setup_hooks.yml
index 69c18ab3..6be6092a 100644
--- a/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_prosody_post_setup_hooks.yml
+++ b/roles/custom/matrix-jitsi/tasks/util/setup_jitsi_prosody_post_setup_hooks.yml
@@ -16,13 +16,13 @@
 
 - name: Ensure matrix-jitsi-prosody container is running
   ansible.builtin.systemd:
-    state: "{{ 'restarted' if matrix_jitsi_prosody_require_restart | d(false) | bool else 'started' }}"
+    state: "{{ 'restarted' if matrix_jitsi_prosody_require_restart | default(false) | bool else 'started' }}"
     name: matrix-jitsi-prosody
   register: matrix_jitsi_prosody_start_result
 
 # If the flag was set, we can safely disable now.
 - name: Disable require restart flag
-  set_fact:
+  ansible.builtin.set_fact:
     matrix_jitsi_prosody_require_restart: false
 
 #
diff --git a/roles/custom/matrix-user-verification-service/handlers/main.yml b/roles/custom/matrix-user-verification-service/handlers/main.yml
index b9ee66d7..b955df80 100644
--- a/roles/custom/matrix-user-verification-service/handlers/main.yml
+++ b/roles/custom/matrix-user-verification-service/handlers/main.yml
@@ -1,6 +1,6 @@
 ---
 
 - name: Ensure systemd reloaded after matrix-user-verification-service.service installation
-  service:
+  ansible.builtin.service:
     daemon_reload: true
   listen: "reload matrix-user-verification-service"
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 172bf186..b61f9cdd 100644
--- a/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml
+++ b/roles/custom/matrix-user-verification-service/tasks/setup_uninstall.yml
@@ -1,25 +1,25 @@
 ---
 
 - name: Check existence of matrix-user-verification-service service
-  stat:
+  ansible.builtin.stat:
     path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_user_verification_service_systemd_service_name }}"
   register: matrix_user_verification_service_service_stat
 
 - when: matrix_user_verification_service_service_stat.stat.exists | bool
   block:
     - name: Ensure matrix-user-verification-service is stopped
-      service:
+      ansible.builtin.service:
         name: "{{ matrix_user_verification_service_systemd_service_basename }}"
         state: stopped
         daemon_reload: true
       register: stopping_result
 
     - name: Ensure matrix-user-verification-service.service doesn't exist
-      file:
+      ansible.builtin.file:
         path: "{{ devture_systemd_docker_base_systemd_path }}/{{ matrix_user_verification_service_systemd_service_name }}"
         state: absent
 
     - name: Ensure Matrix user-verification-service paths don't exist
-      file:
+      ansible.builtin.file:
         path: "{{ matrix_user_verification_service_base_path }}"
         state: absent
diff --git a/roles/custom/matrix-user-verification-service/tasks/validate_config.yml b/roles/custom/matrix-user-verification-service/tasks/validate_config.yml
index 40e9090c..9d7f1be8 100644
--- a/roles/custom/matrix-user-verification-service/tasks/validate_config.yml
+++ b/roles/custom/matrix-user-verification-service/tasks/validate_config.yml
@@ -1,25 +1,25 @@
 ---
 
 - name: Verify homeserver_url is not empty
-  assert:
+  ansible.builtin.assert:
     that:
       - matrix_user_verification_service_uvs_homeserver_url|length > 0
     fail_msg: "Missing variable in {{ matrix_user_verification_service_ansible_name }} role"
 
 - name: Verify Auth is configured properly or disabled
-  assert:
+  ansible.builtin.assert:
     that:
       - matrix_user_verification_service_uvs_access_token|length > 0 or not matrix_user_verification_service_uvs_require_auth|bool
     fail_msg: "If Auth is enabled, a valid (non empty) TOKEN must be given in 'matrix_user_verification_service_uvs_access_token'."
 
 - name: Verify server_name for openid verification is given, if pinning a single server_name is enabled.
-  assert:
+  ansible.builtin.assert:
     that:
       - matrix_user_verification_service_uvs_openid_verify_server_name|length > 0 or not matrix_user_verification_service_uvs_pin_openid_verify_server_name|bool
     fail_msg: "If pinning a single server_name is enabled, a valid (non empty) server_name must be given in 'matrix_user_verification_service_uvs_openid_verify_server_name'."
 
 - name: Verify the homeserver implementation is synapse
-  assert:
+  ansible.builtin.assert:
     that:
       - matrix_homeserver_implementation == 'synapse'
     fail_msg: "The User-Verification-Service requires Synapse as homeserver implementation"