Rejig the Dockerfile