diff --git a/tasks/main.yml b/tasks/main.yml
index 054499700946168ada2de80a7c995ae031ba0c0c..47e368d5db50a7934266e7332301d13fe71e143d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -15,11 +15,11 @@
     url: "{{ ynh_install_script_url }}"
     dest: /tmp/install_yunohost.sh
     mode: 700
-  when: ynh_file_install.stat.exists == False
+  when: not ynh_file_install.stat.exists
 
 - name: Launch Yunohost install script
   ansible.builtin.command: /tmp/install_yunohost.sh -a
-  when: ynh_file_install.stat.exists == False
+  when: not ynh_file_install.stat.exists
 
 - name: Launch Yunohost postinstall
   ansible.builtin.command:
@@ -27,7 +27,7 @@
       --domain "{{ ynh_main_domain }}" \
       --password "{{ ynh_admin_password }}" \
       {% if ynh_ignore_dyndns_server == True %} --ignore-dyndns {% endif %}
-  when: ynh_file_install.stat.exists == False
+  when: not ynh_file_install.stat.exists
 
 - name: Create extra domains
   ansible.builtin.include_tasks: domains.yml
@@ -35,6 +35,7 @@
 
 - name: Run first Yunohost diagnosis
   ansible.builtin.command: yunohost diagnosis run
+  when: not ynh_file_install.stat.exists
 
 - name: Install domain certificates
   ansible.builtin.command: yunohost domain cert-install