diff --git a/tasks/swift_install.yml b/tasks/swift_install.yml
index 6de0935f..86d484c7 100644
--- a/tasks/swift_install.yml
+++ b/tasks/swift_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/swift_install_source.yml b/tasks/swift_install_source.yml
index 947cdb6e..5f6354ff 100644
--- a/tasks/swift_install_source.yml
+++ b/tasks/swift_install_source.yml
@@ -32,7 +32,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
 
@@ -55,7 +55,7 @@
   file:
     path: "{{ swift_bin | dirname }}"
     state: absent
-  when: swift_get_venv | changed
+  when: swift_get_venv is changed
 
 - name: Create swift venv dir
   file:
@@ -63,14 +63,14 @@
     state: directory
     mode: "0755"
   register: swift_venv_dir
-  when: swift_get_venv | changed
+  when: swift_get_venv is changed
 
 - name: Unarchive pre-built venv
   unarchive:
     src: "/var/cache/{{ swift_venv_download_url | basename }}"
     dest: "{{ swift_bin | dirname }}"
     copy: "no"
-  when: swift_get_venv | changed
+  when: swift_get_venv is changed
   notify:
     - Restart swift services
 
@@ -85,7 +85,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: swift_get_venv | failed or swift_get_venv | skipped
@@ -98,7 +98,7 @@
     state: "absent"
   when:
     - ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
-    - swift_get_venv | changed
+    - swift_get_venv is changed
 
 # NOTE(odyssey4me):
 # We reinitialize the venv to ensure that the right
@@ -116,7 +116,7 @@
         --no-pip \
         --no-setuptools \
         --no-wheel
-  when: swift_get_venv | changed
+  when: swift_get_venv is changed
   tags:
     - skip_ansible_lint
 
diff --git a/tasks/swift_proxy_hosts.yml b/tasks/swift_proxy_hosts.yml
index ff7dcfa4..4b58d316 100644
--- a/tasks/swift_proxy_hosts.yml
+++ b/tasks/swift_proxy_hosts.yml
@@ -23,7 +23,7 @@
     login_project_name: "{{ keystone_admin_tenant_name }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: get_gnocchi_project
-  until: get_gnocchi_project|success
+  until: get_gnocchi_project is success
   retries: 5
   delay: 10
   when:
@@ -35,7 +35,7 @@
     swift_gnocchi_service_project_id: "{{ keystone_facts.id }}"
   when:
     - swift_gnocchi_enabled | bool
-    - get_gnocchi_project | success
+    - get_gnocchi_project is success
 
 - name: swift proxy server configuration
   config_template:
diff --git a/tasks/swift_pypy_setup.yml b/tasks/swift_pypy_setup.yml
index ab869902..5c65cbae 100644
--- a/tasks/swift_pypy_setup.yml
+++ b/tasks/swift_pypy_setup.yml
@@ -39,7 +39,7 @@
     - "{{ swift_pypy_env }} /opt/get-pip.py"
     - "{{ swift_pypy_env | dirname }}/pip install --upgrade virtualenv"
   when:
-    - local_pypy | changed
+    - local_pypy is changed
 
 - name: Check for pypy venv
   stat:
@@ -65,7 +65,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/tasks/swift_service_setup.yml b/tasks/swift_service_setup.yml
index e86cf90c..824cf543 100644
--- a/tasks/swift_service_setup.yml
+++ b/tasks/swift_service_setup.yml
@@ -26,7 +26,7 @@
     description: "{{ swift_service_description }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 2
   no_log: True
@@ -45,7 +45,7 @@
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
   when: not swift_service_in_ldap | bool
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True
@@ -64,7 +64,7 @@
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
   when: not swift_service_in_ldap | bool
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True
@@ -79,7 +79,7 @@
     role_name: "{{ swift_operator_role }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True
@@ -97,7 +97,7 @@
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
   when: not swift_service_in_ldap | bool
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True
@@ -112,7 +112,7 @@
     role_name: "{{ swift_reselleradmin_role }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_role
-  until: add_role|success
+  until: add_role is success
   retries: 5
   delay: 10
   no_log: True
@@ -129,7 +129,7 @@
     role_name: "{{ swift_reselleradmin_role }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: ensure_role
-  until: ensure_role|success
+  until: ensure_role is success
   retries: 5
   delay: 10
   when: swift_ceilometer_enabled | bool
@@ -147,7 +147,7 @@
     role_name: "{{ swift_operator_role }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True
@@ -172,7 +172,7 @@
       - url: "{{ swift_service_adminurl }}"
         interface: "admin"
   register: add_service
-  until: add_service|success
+  until: add_service is success
   retries: 5
   delay: 10
   no_log: True
diff --git a/tests/test-swift-functional.yml b/tests/test-swift-functional.yml
index 4a87396a..15b03068 100644
--- a/tests/test-swift-functional.yml
+++ b/tests/test-swift-functional.yml
@@ -39,7 +39,7 @@
     when: groups['keystone_all'] is defined
     register: add_service
     run_once: true
-    until: add_service|success
+    until: add_service is success
     retries: 5
     delay: 10
     no_log: True
@@ -59,7 +59,7 @@
     when: groups['keystone_all'] is defined
     run_once: true
     register: add_service
-    until: add_service|success
+    until: add_service is success
     retries: 5
     delay: 10
     no_log: True
@@ -85,7 +85,7 @@
     when: groups['keystone_all'] is defined
     run_once: true
     register: add_service
-    until: add_service|success
+    until: add_service is success
     retries: 5
     delay: 10
     no_log: True
@@ -111,7 +111,7 @@
     when: groups['keystone_all'] is defined
     run_once: true
     register: add_service
-    until: add_service|success
+    until: add_service is success
     retries: 5
     delay: 10
     no_log: True
diff --git a/tests/test-swift-resources-upgrade.yml b/tests/test-swift-resources-upgrade.yml
index 24d585d2..16303f32 100644
--- a/tests/test-swift-resources-upgrade.yml
+++ b/tests/test-swift-resources-upgrade.yml
@@ -40,7 +40,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