diff --git a/handlers/main.yml b/handlers/main.yml
index 37a8ee1..a2715dc 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -20,7 +20,7 @@
     state: restarted
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   register: _restart
-  until: _restart | success
+  until: _restart  is success
   retries: 5
   delay: 2
 
@@ -31,7 +31,7 @@
     state: restarted
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   register: _restart
-  until: _restart | success
+  until: _restart  is success
   retries: 5
   delay: 2
 
@@ -42,7 +42,7 @@
     state: restarted
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   register: _restart
-  until: _restart | success
+  until: _restart  is success
   retries: 5
   delay: 2
 
@@ -53,7 +53,7 @@
     state: restarted
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   register: _restart
-  until: _restart | success
+  until: _restart  is success
   retries: 5
   delay: 2
 
@@ -64,7 +64,7 @@
     state: restarted
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   register: _restart
-  until: _restart | success
+  until: _restart  is success
   retries: 5
   delay: 2
 
@@ -75,7 +75,7 @@
     state: restarted
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   register: _restart
-  until: _restart | success
+  until: _restart  is success
   retries: 5
   delay: 2
 
@@ -86,7 +86,7 @@
     state: restarted
     daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
   register: _restart
-  until: _restart | success
+  until: _restart  is success
   retries: 5
   delay: 2
 
diff --git a/tasks/repo_cacher.yml b/tasks/repo_cacher.yml
index dea24ba..6ee8eea 100644
--- a/tasks/repo_cacher.yml
+++ b/tasks/repo_cacher.yml
@@ -18,7 +18,7 @@
     name: "{{ repo_pkg_cache_server_distro_packages }}"
     state: "{{ repo_server_package_state }}"
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 5
   when:
diff --git a/tasks/repo_install.yml b/tasks/repo_install.yml
index 5a13905..91cc64c 100644
--- a/tasks/repo_install.yml
+++ b/tasks/repo_install.yml
@@ -20,7 +20,7 @@
   when:
     - ansible_pkg_mgr in ['yum', 'dnf']
   register: _add_yum_keys
-  until: _add_yum_keys | success
+  until: _add_yum_keys  is success
   retries: 5
   delay: 2
 
@@ -36,7 +36,7 @@
   when:
     - ansible_pkg_mgr in ['yum', 'dnf']
   register: install_epel_repo
-  until: install_epel_repo|success
+  until: install_epel_repo is success
   retries: 5
   delay: 2
 
@@ -60,7 +60,7 @@
     update_cache: "{{ (ansible_pkg_mgr == 'apt') | 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: 5
 
@@ -91,7 +91,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
 
@@ -112,7 +112,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
       notify:
@@ -130,7 +130,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
       notify:
diff --git a/tests/test-repo-server-functional.yml b/tests/test-repo-server-functional.yml
index 1faf22b..520fb1a 100644
--- a/tests/test-repo-server-functional.yml
+++ b/tests/test-repo-server-functional.yml
@@ -62,7 +62,7 @@
     - name: Check apt-cacher-ng is running
       command: "pgrep apt-cacher-ng"
       register: pgrep_apt_cacher_ng
-      until: pgrep_apt_cacher_ng | success
+      until: pgrep_apt_cacher_ng  is success
       retries: 5
       delay: 2
       tags: