Containers delete at the proper time
Merge pull request #1168 from control-center/feature/cc-297

Containers delete at the proper time