Version up and optimizing the Dockerfiles