diff --git a/lxc-php/meta/main.yml b/lxc-php/meta/main.yml
index 88d4c6e9..f0f9bb70 100644
--- a/lxc-php/meta/main.yml
+++ b/lxc-php/meta/main.yml
@@ -27,4 +27,4 @@ galaxy_info:
 
 allow_duplicates: yes
 
-dependencies: [] 
+dependencies: []
diff --git a/mongodb/tasks/main_bookworm.yml b/mongodb/tasks/main_bookworm.yml
index 8261dcb2..ef64f00c 100644
--- a/mongodb/tasks/main_bookworm.yml
+++ b/mongodb/tasks/main_bookworm.yml
@@ -11,7 +11,7 @@
 #   - ansible_distribution_release == "bookworm"
 #   - mongodb_version is version('5.0', '<')
 
-- name: Add MongoDB repository 
+- name: Add MongoDB repository
   ansible.builtin.template:
     src: mongodb.sources.j2
     dest: /etc/apt/sources.list.d/mongodb.sources
diff --git a/php/tasks/main_bookworm.yml b/php/tasks/main_bookworm.yml
index d4dd381f..68de60d6 100644
--- a/php/tasks/main_bookworm.yml
+++ b/php/tasks/main_bookworm.yml
@@ -3,8 +3,7 @@
 - name: "Set php version to 8.2 (Debian 12)"
   ansible.builtin.set_fact:
     php_version: "8.2"
-  when:
-    - php_sury_enable == false
+  when: not (php_sury_enable | bool)
   check_mode: no
 
 - name: "Set php config directories (Debian 12)"
diff --git a/php/tasks/main_bullseye.yml b/php/tasks/main_bullseye.yml
index b12740a7..f8232c45 100644
--- a/php/tasks/main_bullseye.yml
+++ b/php/tasks/main_bullseye.yml
@@ -3,8 +3,7 @@
 - name: "Set php version to 7.4 if Sury repo is not enabled"
   ansible.builtin.set_fact:
     php_version: "7.4"
-  when:
-    - php_sury_enable == False
+  when: not (php_sury_enable | bool)
   check_mode: no
 
 - name: "Set variables (Debian 11)"
diff --git a/php/tasks/main_buster.yml b/php/tasks/main_buster.yml
index 588d21d5..6a5f1d1a 100644
--- a/php/tasks/main_buster.yml
+++ b/php/tasks/main_buster.yml
@@ -7,8 +7,7 @@
   ansible.builtin.set_fact:
     php_version: "7.3"
   check_mode: no
-  when:
-    - not (php_sury_enable | bool)
+  when: not (php_sury_enable | bool)
 
 - name: "Set variables (Debian 10)"
   ansible.builtin.set_fact:
diff --git a/postfix/meta/main.yml b/postfix/meta/main.yml
index 188769a2..b39e6795 100644
--- a/postfix/meta/main.yml
+++ b/postfix/meta/main.yml
@@ -25,8 +25,8 @@ galaxy_info:
     # alphanumeric characters. Maximum 20 tags per role.
 
 dependencies:
-  - { role: evolix/ldap, ldap_schema: 'cn4evolix.ldif', when: postfix_packmail == True }
-  - { role: evolix/spamassasin, when: postfix_packmail == True }
-  - { role: evolix/clamav, when: postfix_packmail == True }
-  - { role: evolix/opendkim, when: postfix_packmail == True }
-  - { role: evolix/dovecot, when: postfix_packmail == True }
+  - { role: evolix/ldap, ldap_schema: 'cn4evolix.ldif', when: postfix_packmail | bool }
+  - { role: evolix/spamassasin, when: postfix_packmail | bool }
+  - { role: evolix/clamav, when: postfix_packmail | bool }
+  - { role: evolix/opendkim, when: postfix_packmail | bool }
+  - { role: evolix/dovecot, when: postfix_packmail | bool }
diff --git a/postfix/tasks/packmail.yml b/postfix/tasks/packmail.yml
index 170dbd35..be0b075e 100644
--- a/postfix/tasks/packmail.yml
+++ b/postfix/tasks/packmail.yml
@@ -21,7 +21,7 @@
 - name: make sure a service Mailgraph is running
   ansible.builtin.systemd:
     name: mailgraph.service
-    state: started  
+    state: started
     enabled: true
 
 - name: create packmail main.cf
diff --git a/varnish/tasks/main.yml b/varnish/tasks/main.yml
index b06ab5a2..6cdb92db 100644
--- a/varnish/tasks/main.yml
+++ b/varnish/tasks/main.yml
@@ -137,7 +137,7 @@
     dest: "{{ varnish_config_file }}"
     mode: "0644"
     force: yes
-  when: "{{ varnish_update_config }}"
+  when: varnish_update_config | bool
   loop: "{{ query('first_found', templates) }}"
   vars:
     templates:
diff --git a/webapps/nextcloud/tasks/config.yml b/webapps/nextcloud/tasks/config.yml
index 2cc8cd7e..93b9b925 100644
--- a/webapps/nextcloud/tasks/config.yml
+++ b/webapps/nextcloud/tasks/config.yml
@@ -36,7 +36,7 @@
     chdir: "{{ nextcloud_webroot }}"
     creates: "{{ nextcloud_home }}/config/config.php"
   become_user: "{{ nextcloud_user }}"
-  when: (nc_status.stdout | from_json).installed == false
+  when: not ((nc_status.stdout | from_json).installed | bool)
   tags:
     - nextcloud