Updates to make docker build faster