diff --git a/handlers/main.yml b/handlers/main.yml
index 648da36..8a12c8e 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -21,7 +21,7 @@
     daemon_reload: yes
   with_items: "{{ filtered_zun_services }}"
   register: _stop
-  until: _stop | success
+  until: _stop  is success
   retries: 5
   delay: 2
   listen: "Restart zun services"
@@ -34,7 +34,7 @@
     daemon_reload: yes
   with_items: "{{ filtered_zun_services }}"
   register: _start
-  until: _start | success
+  until: _start  is success
   retries: 5
   delay: 2
   listen: "Restart zun services"
@@ -49,7 +49,7 @@
     - docker
     - kuryr-libnetwork
   register: _stop
-  until: _stop | success
+  until: _stop  is success
   retries: 5
   delay: 2
   listen: "Restart kuryr services"
@@ -64,7 +64,7 @@
     - docker
     - kuryr-libnetwork
   register: _start
-  until: _start | success
+  until: _start  is success
   retries: 5
   delay: 2
   listen: "Restart kuryr services"
diff --git a/tasks/zun_install.yml b/tasks/zun_install.yml
index 81c7214..a66bd01 100644
--- a/tasks/zun_install.yml
+++ b/tasks/zun_install.yml
@@ -56,7 +56,7 @@
     path: "{{ zun_bin | dirname }}"
     state: absent
   when:
-    - zun_get_venv | changed
+    - zun_get_venv  is changed
 
 - name: Create zun venv dir
   file:
@@ -64,7 +64,7 @@
     state: directory
   register: zun_venv_dir
   when:
-    - zun_get_venv | changed
+    - zun_get_venv  is changed
 
 - name: Unarchive pre-built venv
   unarchive:
@@ -72,7 +72,7 @@
     dest: "{{ zun_bin | dirname }}"
     copy: "no"
   when:
-    - zun_get_venv | changed
+    - zun_get_venv  is changed
   notify:
     - Manage LB
     - Restart zun services
@@ -88,7 +88,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:
@@ -105,7 +105,7 @@
     state: "absent"
   when:
     - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
-    - zun_get_venv | changed
+    - zun_get_venv  is changed
 
 # NOTE(odyssey4me):
 # We reinitialize the venv to ensure that the right
@@ -124,7 +124,7 @@
         --no-setuptools \
         --no-wheel
   when:
-    - zun_get_venv | changed
+    - zun_get_venv  is changed
   tags:
     - skip_ansible_lint