diff --git a/ansible/roles/baremetal/tasks/install.yml b/ansible/roles/baremetal/tasks/install.yml
index ea3e7d9a9c18393b667ea0633b96f21724101f17..cfc756b78cecbb061d4edf6bb07e6c4230c36ac1 100644
--- a/ansible/roles/baremetal/tasks/install.yml
+++ b/ansible/roles/baremetal/tasks/install.yml
@@ -60,7 +60,7 @@
   package: name={{item}} state=absent
   with_items: "{{ ubuntu_pkg_removals }}"
   become: True
-  when: ansible_distribution|lower == "ubuntu" | bool
+  when: ansible_distribution|lower == "ubuntu"
 
 - name: Remove packages
   package: name={{item}} state=absent
diff --git a/ansible/roles/baremetal/tasks/post-install.yml b/ansible/roles/baremetal/tasks/post-install.yml
index 75c6de538228995dd6dd88df8b4fd1565ea7b43d..c8a6bc2320ceae6bec0d151864626ecc42a687ae 100644
--- a/ansible/roles/baremetal/tasks/post-install.yml
+++ b/ansible/roles/baremetal/tasks/post-install.yml
@@ -27,7 +27,7 @@
   become: True
   when:
     - ansible_distribution == "Ubuntu"
-    - apparmor_libvirtd_profile.stat.exists | bool
+    - apparmor_libvirtd_profile.stat.exists
 
 - name: Create docker group
   group:
diff --git a/ansible/roles/baremetal/tasks/pre-install.yml b/ansible/roles/baremetal/tasks/pre-install.yml
index d8632ae4b5b27ff772814412f93998cb6b587772..3818c9b2c2f81b2bb56347cf72986c608ed42be2 100644
--- a/ansible/roles/baremetal/tasks/pre-install.yml
+++ b/ansible/roles/baremetal/tasks/pre-install.yml
@@ -141,4 +141,4 @@
     recurse: yes
     mode: 0644
   become: True
-  when: create_kolla_user | bool == False
+  when: not create_kolla_user | bool
diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml
index 78c85e17e91602847079e8d9f458923a4e756728..2bff0cfc692647e04841df2810d74fa223e3bf0c 100644
--- a/ansible/roles/ceph/tasks/bootstrap_osds.yml
+++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml
@@ -34,7 +34,7 @@
               ceph_osd_wipe_disk: 'yes-i-really-really-mean-it' within globals.yml)
   with_items: "{{ osds_bootstrap|default([]) }}"
   when:
-    - item.external_journal | bool == False
+    - not item.external_journal | bool
     - item.device.split('/')[2] in ansible_devices  # if there is no device in setup (like loopback, we don't need to warn user
     - ansible_devices[item.device.split('/')[2]].partitions|count > 1
     - ceph_osd_wipe_disk != "yes-i-really-really-mean-it"
@@ -81,7 +81,7 @@
               ceph_osd_wipe_disk: 'yes-i-really-really-mean-it' within globals.yml)
   with_items: "{{ osds_cache_bootstrap|default([]) }}"
   when:
-    - item.external_journal | bool == False
+    - not item.external_journal | bool
     - ansible_devices[item.device.split('/')[2]].partitions|count > 1
     - ceph_osd_wipe_disk != "yes-i-really-really-mean-it"
 
diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml
index e8b46217547eec0f997ccaeb013289a2180929e0..06a275cb46347ee1ad49f65cd86479a1388f7db8 100644
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@@ -47,7 +47,7 @@
       enabled: true
     - name: "01-es"
       enabled: "{{ enable_elasticsearch | bool or
-                ( elasticsearch_address != kolla_internal_vip_address ) | bool }}"
+                ( elasticsearch_address != kolla_internal_vip_address ) }}"
   notify:
     - Restart fluentd container
 
diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml
index 6f9ce59158ca8620165334277ec5021530ebb132..7a9e4dd389ba79974f92a08ab61273ae1508541f 100644
--- a/ansible/roles/keystone/tasks/config.yml
+++ b/ansible/roles/keystone/tasks/config.yml
@@ -138,7 +138,7 @@
   when:
     - inventory_hostname in groups[keystone.group]
     - keystone.enabled | bool
-    - check_keystone_paste_ini.stat.exists | bool
+    - check_keystone_paste_ini.stat.exists
   notify:
     - Restart keystone container
 
diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml
index 29f5bc6294637d8a9c405a4c5b8ecd7d74052b81..5b12ad20a37abae44d2846974371afb736c7e440 100644
--- a/ansible/roles/nova/tasks/config.yml
+++ b/ansible/roles/nova/tasks/config.yml
@@ -138,7 +138,7 @@
   when:
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
-    - nova_policy.stat.exists | bool
+    - nova_policy.stat.exists
     - item.key in services_require_policy_json
   with_dict: "{{ nova_services }}"
   notify:
diff --git a/ansible/roles/nova/tasks/deploy.yml b/ansible/roles/nova/tasks/deploy.yml
index 35e32efc514319f5ab45352ec6b813e8dd455b7f..1a246a407b2cadd333481dbed4283fac38d50888 100644
--- a/ansible/roles/nova/tasks/deploy.yml
+++ b/ansible/roles/nova/tasks/deploy.yml
@@ -12,7 +12,7 @@
 
 - include: external-ceph.yml
   when:
-    - enable_ceph | bool == False and nova_backend == "rbd"
+    - not enable_ceph | bool and nova_backend == "rbd"
     - inventory_hostname in groups['compute']
 
 - include: register.yml
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 17de9774a97ffb92bb9daea913b783098221afc9..fe9b84614eb4dea6a980e528b199c3934f0d2ea4 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -182,7 +182,7 @@ kolla_internal_vip_address: "10.10.10.254"
 #enable_neutron_vpnaas: "no"
 #enable_nova_serialconsole_proxy: "no"
 #enable_octavia: "no"
-#enable_openvswitch: "{{ neutron_plugin_agent != 'linuxbridge' | bool }}"
+#enable_openvswitch: "{{ neutron_plugin_agent != 'linuxbridge' }}"
 #enable_osprofiler: "no"
 #enable_panko: "no"
 #enable_rally: "no"