Defer removing failed containers until Cleanup()

Merge request reports