diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c75ee596df591b1b47246900523321e0ee843d28..ab147eabcf9fbe9d29bb3052c88c344520cae128 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -302,8 +302,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
     - |