Optimize dockerfiles for faster builds, better caching