Let's get another PR out to use a container per day. A single big container is scary.