diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17d3fd3a36bd3e11913cd05d181b5f48b4f5a032..dd7cfee714cba266e0a875e72b338e4ad87517ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -175,4 +175,7 @@ clean:
   script:
     - source ./$NECTAR_ALLOCATION-openrc.sh
     - bash -x ./heat/heatcicdwrapper.sh delete_if_exists $STACKNAME
+  when:
+    - delayed
+    - always