Refactor the Dockerfile and direct users better to it