Updates to containers and setup.