diff --git a/playbooks/host_update.yml b/playbooks/host_update.yml
index 05d14df90b..c7ba870cd9 100644
--- a/playbooks/host_update.yml
+++ b/playbooks/host_update.yml
@@ -29,4 +29,4 @@
 
   - name: run rkhunter --propupd
     command: /usr/bin/rkhunter --propupd
-    when: rkhunter|success
+    when: rkhunter is success
diff --git a/playbooks/rkhunter_only.yml b/playbooks/rkhunter_only.yml
index 63179e2fc0..92f5b35af0 100644
--- a/playbooks/rkhunter_only.yml
+++ b/playbooks/rkhunter_only.yml
@@ -12,9 +12,4 @@
 
   - name: run rkhunter --propupd
     command: /usr/bin/rkhunter --propupd
-    when: rkhunter|success
-
-
-
-
-
+    when: rkhunter is success
diff --git a/playbooks/rkhunter_update.yml b/playbooks/rkhunter_update.yml
index e2939877d1..3e59278929 100644
--- a/playbooks/rkhunter_update.yml
+++ b/playbooks/rkhunter_update.yml
@@ -20,9 +20,4 @@
 
   - name: run rkhunter --propupd
     command: /usr/bin/rkhunter --propupd
-    when: rkhunter|success
-
-
-
-
-
+    when: rkhunter is success
diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml
index fb5afeda2b..e0879029d3 100644
--- a/playbooks/vhost_update.yml
+++ b/playbooks/vhost_update.yml
@@ -70,4 +70,4 @@
 
   - name: run rkhunter --propupd
     command: /usr/bin/rkhunter --propupd
-    when: rkhunter|success
+    when: rkhunter is success
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index a6eb0ea252..883ea02040 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -54,7 +54,7 @@
   ini_file: dest=/etc/NetworkManager/NetworkManager.conf section=main option=dns value=none
   notify:
   - restart NetworkManager
-  when: ansible_distribution_major_version|int >=7 and nmclitest|success and ( not ansible_ifcfg_blacklist) and not nm_controlled_resolv
+  when: ansible_distribution_major_version|int >=7 and nmclitest is success and ( not ansible_ifcfg_blacklist) and not nm_controlled_resolv
   tags:
    - config
    - resolvconf
@@ -67,7 +67,7 @@
   changed_when: false
   failed_when: 'if_uuid.stdout == ""'
   check_mode: no
-  when: ansible_distribution_major_version|int >=7 and nmclitest|success and ( not ansible_ifcfg_blacklist )
+  when: ansible_distribution_major_version|int >=7 and nmclitest is success and ( not ansible_ifcfg_blacklist )
   tags:
    - config
    - ifcfg
@@ -81,7 +81,7 @@
 #  - restart NetworkManager
   - reload NetworkManager-connections
   - apply interface-changes
-  when: (virthost is not defined) and (item.startswith(('eth','br','enc'))) and (hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether') and (ansible_distribution_major_version|int >=7) and hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] and nmclitest|success and ( not ansible_ifcfg_blacklist ) and ( ansible_ifcfg_whitelist is not defined or item in ansible_ifcfg_whitelist )
+  when: (virthost is not defined) and (item.startswith(('eth','br','enc'))) and (hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['type'] == 'ether') and (ansible_distribution_major_version|int >=7) and hostvars[inventory_hostname]['ansible_' + item.replace('-','_')]['active'] and nmclitest is success and ( not ansible_ifcfg_blacklist ) and ( ansible_ifcfg_whitelist is not defined or item in ansible_ifcfg_whitelist )
   tags:
    - config
    - ifcfg
diff --git a/roles/beaker/server/tasks/main.yml b/roles/beaker/server/tasks/main.yml
index 3d6eb896ab..261a7b3c1e 100644
--- a/roles/beaker/server/tasks/main.yml
+++ b/roles/beaker/server/tasks/main.yml
@@ -100,7 +100,7 @@
 
 - name: initialize beaker database
   command: "beaker-init -u {{beaker_server_admin_user}} -p {{beaker_server_admin_pass}} -e {{beaker_server_email}}"
-  when: setup_beaker_conf|success
+  when: setup_beaker_conf is success
   tags:
     - beaker-init
     - beaker-server
diff --git a/roles/nginx/tasks/ssl-setup.yml b/roles/nginx/tasks/ssl-setup.yml
index a0e138f540..2fbc5ffc97 100644
--- a/roles/nginx/tasks/ssl-setup.yml
+++ b/roles/nginx/tasks/ssl-setup.yml
@@ -22,7 +22,7 @@
     - "{{ httpd_ssl_crt_file }}"
     skip: True
   register: setup_ssl_pem
-  when: setup_ssl_key|success
+  when: setup_ssl_key is success
   tags:
   - update_ssl_certs