diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6dae4c9e33600833cad55fe8ef77241af426fd05..ce33a84f4499dc1858633a231ac0cb6ca4969c5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,7 @@ before_script:
   script:
     - ./tests/scripts/testcases_run.sh
   after_script:
-    - ./tests/scripts/testcases_cleanup.sh
+    - chronic ./tests/scripts/testcases_cleanup.sh
 
 # For failfast, at least 1 job must be defined in .gitlab-ci.yml
 # Premoderated with manual actions
diff --git a/.gitlab-ci/terraform.yml b/.gitlab-ci/terraform.yml
index c9038e35f782c045b0dd4cb4317a446bfc6ee5b3..8b26fec0b1fad4f646ef378cbb5939a591b3cf79 100644
--- a/.gitlab-ci/terraform.yml
+++ b/.gitlab-ci/terraform.yml
@@ -44,7 +44,7 @@
     - tests/scripts/testcases_run.sh
   after_script:
     # Cleanup regardless of exit code
-    - ./tests/scripts/testcases_cleanup.sh
+    - chronic ./tests/scripts/testcases_cleanup.sh
 
 tf-validate-openstack:
   extends: .terraform_validate