diff --git a/handlers/main.yml b/handlers/main.yml
index ac585fa..1048825 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -19,7 +19,7 @@
     state: "restarted"
     daemon_reload: yes
   register: apache_restart
-  until: apache_restart|success
+  until: apache_restart is success
   retries: 5
   delay: 2
 
diff --git a/tasks/barbican_install.yml b/tasks/barbican_install.yml
index ac5af9f..2edf744 100644
--- a/tasks/barbican_install.yml
+++ b/tasks/barbican_install.yml
@@ -32,7 +32,7 @@
     update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
     cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
   register: install_packages
-  until: install_packages | success
+  until: install_packages is success
   retries: 5
   delay: 2
 
diff --git a/tasks/barbican_install_source.yml b/tasks/barbican_install_source.yml
index 2641d04..b35c951 100644
--- a/tasks/barbican_install_source.yml
+++ b/tasks/barbican_install_source.yml
@@ -41,21 +41,21 @@
   file:
     path: "{{ barbican_bin | dirname }}"
     state: absent
-  when: barbican_get_venv | changed
+  when: barbican_get_venv is changed
 
 - name: Create barbican venv dir
   file:
     path: "{{ barbican_bin | dirname }}"
     state: directory
   register: barbican_venv_dir
-  when: barbican_get_venv | changed
+  when: barbican_get_venv is changed
 
 - name: Unarchive pre-built venv
   unarchive:
     src: "/var/cache/{{ barbican_venv_download_url | basename }}"
     dest: "{{ barbican_bin | dirname }}"
     copy: "no"
-  when: barbican_get_venv | changed
+  when: barbican_get_venv is changed
   notify: Restart barbican services
 
 - name: Install pip packages
@@ -69,7 +69,7 @@
       {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
       {{ pip_install_options | default('') }}
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 2
   when: barbican_get_venv | failed or barbican_get_venv | skipped
@@ -81,7 +81,7 @@
     state: "absent"
   when:
     - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
-    - barbican_get_venv | changed
+    - barbican_get_venv is changed
 
 # NOTE(odyssey4me):
 # We reinitialize the venv to ensure that the right
@@ -99,7 +99,7 @@
         --no-pip \
         --no-setuptools \
         --no-wheel
-  when: barbican_get_venv | changed
+  when: barbican_get_venv is changed
   tags:
     - skip_ansible_lint