Dockerfile improvements for image size...