Dockerfile improvements