Add auto removal flag to containers