Tweaks to how we build docker containers.