diff --git a/roles/custom/matrix-client-hydrogen/defaults/main.yml b/roles/custom/matrix-client-hydrogen/defaults/main.yml
index c3f2ab958..6ee304cfa 100644
--- a/roles/custom/matrix-client-hydrogen/defaults/main.yml
+++ b/roles/custom/matrix-client-hydrogen/defaults/main.yml
@@ -6,7 +6,7 @@ matrix_client_hydrogen_enabled: true
 matrix_client_hydrogen_container_image_self_build: false
 matrix_client_hydrogen_container_image_self_build_repo: "https://github.com/vector-im/hydrogen-web.git"
 
-matrix_client_hydrogen_version: v0.3.6
+matrix_client_hydrogen_version: v0.3.7
 matrix_client_hydrogen_docker_image: "{{ matrix_client_hydrogen_docker_image_name_prefix }}vector-im/hydrogen-web:{{ matrix_client_hydrogen_version }}"
 matrix_client_hydrogen_docker_image_name_prefix: "{{ 'localhost/' if matrix_client_hydrogen_container_image_self_build else 'ghcr.io/' }}"
 matrix_client_hydrogen_docker_image_force_pull: "{{ matrix_client_hydrogen_docker_image.endswith(':latest') }}"
diff --git a/roles/custom/matrix-user-verification-service/defaults/main.yml b/roles/custom/matrix-user-verification-service/defaults/main.yml
index 52b30a28a..5b3611b88 100644
--- a/roles/custom/matrix-user-verification-service/defaults/main.yml
+++ b/roles/custom/matrix-user-verification-service/defaults/main.yml
@@ -32,7 +32,7 @@ matrix_user_verification_service_systemd_service_name: "{{ matrix_user_verificat
 ## REQUIRED
 
 # Homeserver client API admin token (synapse only)-  Required for the service to verify room membership
-# matrix_user_verification_service_uvs_access_token:
+matrix_user_verification_service_uvs_access_token: ''
 
 # homeserver client api url
 matrix_user_verification_service_uvs_homeserver_url: "{{ matrix_homeserver_container_url }}"
diff --git a/roles/custom/matrix-user-verification-service/tasks/main.yml b/roles/custom/matrix-user-verification-service/tasks/main.yml
index 926860362..6eaaaf232 100644
--- a/roles/custom/matrix-user-verification-service/tasks/main.yml
+++ b/roles/custom/matrix-user-verification-service/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - block:
-    - when: matrix_jitsi_enabled | bool
+    - when: run_setup | bool and matrix_user_verification_service_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
     - when: run_setup | bool and matrix_user_verification_service_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"