Improve the Dockerfile