diff --git a/roles/tobiko-cleanup/tasks/main.yaml b/roles/tobiko-cleanup/tasks/main.yaml
index 70fa72402..cbcfc3310 100644
--- a/roles/tobiko-cleanup/tasks/main.yaml
+++ b/roles/tobiko-cleanup/tasks/main.yaml
@@ -1,8 +1,17 @@
 ---
 
-- name: "cleanup stacks created by tobiko tests"
+- name: "cleanup Heat stacks created by Tobiko tests"
   shell: |
     source {{ stackrc_file }}
-    openstack stack list -f value -c 'Stack Name' | grep "^tobiko\." | xargs openstack stack delete --wait
-    openstack image list -f value -c Name | grep "^tobiko\." | xargs openstack image delete
+    openstack stack list -f value -c 'Stack Name' | \
+        grep "^tobiko\." | \
+        xargs -r openstack stack delete -y --wait
+  ignore_errors: yes
+
+- name: "cleanup Glance images created by Tobiko tests"
+  shell: |
+    source {{ stackrc_file }}
+    openstack image list -f value -c 'Name' | \
+        grep "^tobiko\." | \
+        xargs -r openstack image delete
   ignore_errors: yes