More changes for the docker refactor