Dockerfile improvments.