diff --git a/tasks/ceph_auth.yml b/tasks/ceph_auth.yml
index 5fdc3bf..086b1b6 100644
--- a/tasks/ceph_auth.yml
+++ b/tasks/ceph_auth.yml
@@ -25,7 +25,7 @@
   changed_when: false
   delegate_to: '{{ ceph_mon_host }}'
   register: ceph_client_keyrings
-  until: ceph_client_keyrings|success
+  until: ceph_client_keyrings is success
   retries: 3
   tags:
     - ceph-config
diff --git a/tasks/ceph_install.yml b/tasks/ceph_install.yml
index 63f8487..b24f7f7 100644
--- a/tasks/ceph_install.yml
+++ b/tasks/ceph_install.yml
@@ -20,7 +20,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
   notify:
diff --git a/tasks/ceph_preinstall_apt.yml b/tasks/ceph_preinstall_apt.yml
index 2c0caf9..29b9f9b 100644
--- a/tasks/ceph_preinstall_apt.yml
+++ b/tasks/ceph_preinstall_apt.yml
@@ -32,7 +32,7 @@
         url: "{{ item.url | default(omit) }}"
         state: "present"
       register: add_keys
-      until: add_keys|success
+      until: add_keys is success
       retries: 5
       delay: 2
       with_items: "{{ ceph_gpg_keys }}"
@@ -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: "{{ ceph_gpg_keys }}"
@@ -81,8 +81,8 @@
 - name: Update Apt cache
   apt:
     update_cache: yes
-  when: add_repos | changed
+  when: add_repos is changed
   register: update_apt_cache
-  until: update_apt_cache | success
+  until: update_apt_cache is success
   retries: 5
   delay: 2
diff --git a/tasks/ceph_preinstall_yum.yml b/tasks/ceph_preinstall_yum.yml
index f359325..6cff0ac 100644
--- a/tasks/ceph_preinstall_yum.yml
+++ b/tasks/ceph_preinstall_yum.yml
@@ -18,7 +18,7 @@
     key: "{{ ceph_gpg_keys }}"
     state: "present"
   register: add_keys
-  until: add_keys|success
+  until: add_keys is success
   failed_when: false
   retries: 5
   delay: 2