diff --git a/tasks/main.yml b/tasks/main.yml
index 67d4e66..ea16799 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -54,7 +54,7 @@
     pkg: "{{ nspawn_hosts_distro_packages }}"
     state: "{{ nspawn_hosts_package_state }}"
   register: install_packages
-  until: install_packages|success
+  until: install_packages is success
   retries: 5
   delay: 2
   notify:
diff --git a/tasks/nspawn_cache_prestage.yml b/tasks/nspawn_cache_prestage.yml
index b356598..70544fc 100644
--- a/tasks/nspawn_cache_prestage.yml
+++ b/tasks/nspawn_cache_prestage.yml
@@ -40,7 +40,7 @@
       register: legacy_image_url
       retries: 3
       delay: 1
-      until: legacy_image_url | success
+      until: legacy_image_url is success
 
     - name: Set nspawn cache fact(s) (legacy)
       set_fact:
diff --git a/tasks/nspawn_volume.yml b/tasks/nspawn_volume.yml
index d7f7b4d..a66d6d0 100644
--- a/tasks/nspawn_volume.yml
+++ b/tasks/nspawn_volume.yml
@@ -129,4 +129,4 @@
   changed_when: false
   failed_when: false
   when:
-    - machines_create | changed
+    - machines_create is changed
diff --git a/tests/test.yml b/tests/test.yml
index b951c79..e6f824a 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -118,7 +118,7 @@
         path: /var/lib/machines/test-container/test-file
         state: touch
       failed_when:
-        - read_only_test | success
+        - read_only_test is success
       register: read_only_test
 
     - name: Remove base image