delete containers during build after every step Upstream-commit: 897bf5439d83b5255cdcc53e8a888740919b9d04 Component: engine