Improve build image time