diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2bb068bb8d31fab7a30cf936e67ac98205824e56..07c45663ca1ea32dd4e5419e904d905db792e58d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -301,8 +301,10 @@ test_ood_image:
       fi
     - |
       if [ "$FAILED" = true ]; then
-        openstack server delete $NEW_INSTANCE_ID
-        openstack image delete $BUILT_OOD_IMAGE_ID
+        if [ "${DELETE_WHEN_FAILED-true}" = true ]; then
+          openstack server delete $NEW_INSTANCE_ID
+          openstack image delete $BUILT_OOD_IMAGE_ID
+        fi
         false
       fi
     - |