Cleaning up validations to be same-ish as those in docker-build-server