Add clean up of containers on shutdown of service