Changes to Dockerfiles for push to global repo, improving deployment