diff --git a/tasks/galera_client_install.yml b/tasks/galera_client_install.yml
index 2418246..1828cf5 100644
--- a/tasks/galera_client_install.yml
+++ b/tasks/galera_client_install.yml
@@ -28,7 +28,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
   when:
diff --git a/tasks/galera_client_install_apt.yml b/tasks/galera_client_install_apt.yml
index 909c612..630ee71 100644
--- a/tasks/galera_client_install_apt.yml
+++ b/tasks/galera_client_install_apt.yml
@@ -33,7 +33,7 @@
         state: "present"
       with_items: "{{ galera_client_gpg_keys }}"
       register: add_keys
-      until: add_keys|success
+      until: add_keys is success
       retries: 5
       delay: 2
       tags:
@@ -47,7 +47,7 @@
         url: "{{ item.fallback_url | default(omit) }}"
         state: "present"
       register: add_keys_fallback
-      until: add_keys_fallback | success
+      until: add_keys_fallback is success
       retries: 5
       delay: 2
       with_items: "{{ galera_client_gpg_keys }}"
@@ -104,9 +104,9 @@
 - name: Update Apt cache
   apt:
     update_cache: yes
-  when: add_repo | changed
+  when: add_repo is changed
   register: update_apt_cache
-  until: update_apt_cache | success
+  until: update_apt_cache is success
   retries: 5
   delay: 2
   tags:
diff --git a/tasks/galera_client_install_yum.yml b/tasks/galera_client_install_yum.yml
index 0908b61..4429cca 100644
--- a/tasks/galera_client_install_yum.yml
+++ b/tasks/galera_client_install_yum.yml
@@ -49,7 +49,7 @@
         state: present
         key: "{{ item.keyserver }}/{{ item.key_name }}"
       register: add_keys
-      until: add_keys|success
+      until: add_keys is success
       retries: 5
       delay: 2
       with_items: "{{ galera_client_gpg_keys }}"
@@ -62,7 +62,7 @@
         state: present
         key: "{{ item.fallback_keyserver }}/{{ item.key_name }}"
       register: add_keys
-      until: add_keys|success
+      until: add_keys is success
       retries: 5
       delay: 2
       with_items: "{{ galera_client_gpg_keys }}"
@@ -79,7 +79,7 @@
     gpgcheck: yes
     enabled: yes
   register: add_repos
-  until: add_repos|success
+  until: add_repos is success
   retries: 5
   delay: 2
   with_items:
diff --git a/tasks/galera_client_install_zypper.yml b/tasks/galera_client_install_zypper.yml
index 25f2dbe..4a7cfaa 100644
--- a/tasks/galera_client_install_zypper.yml
+++ b/tasks/galera_client_install_zypper.yml
@@ -48,7 +48,7 @@
         state: present
         key: "{{ item.keyserver }}/{{ item.key_name }}"
       register: add_keys
-      until: add_keys|success
+      until: add_keys is success
       retries: 5
       delay: 2
       with_items: "{{ galera_client_gpg_keys }}"
@@ -61,7 +61,7 @@
         state: present
         key: "{{ item.fallback_keyserver }}/{{ item.key_name }}"
       register: add_keys
-      until: add_keys|success
+      until: add_keys is success
       retries: 5
       delay: 2
       with_items: "{{ galera_client_gpg_keys }}"
@@ -78,7 +78,7 @@
     auto_import_keys: no
     enabled: yes
   register: add_repos
-  until: add_repos | success
+  until: add_repos is success
   retries: 5
   delay: 2
   with_items: