diff --git a/roles/tobiko-cleanup/tasks/main.yaml b/roles/tobiko-cleanup/tasks/main.yaml
index a2e0d3819..32b0efaf8 100644
--- a/roles/tobiko-cleanup/tasks/main.yaml
+++ b/roles/tobiko-cleanup/tasks/main.yaml
@@ -12,7 +12,11 @@
     source {{ stackrc_file }}
     openstack stack list -f value -c 'Stack Name' | \
         grep "^tobiko\." | \
-        xargs -r openstack stack delete -y --wait
+        xargs -r timeout 180 openstack stack delete -y --wait
+  register: result
+  retries: 5
+  delay: 5
+  until: result.rc == 0
   ignore_errors: yes
 
 - name: "cleanup Glance images created by Tobiko tests"