Refactored images to be built using build file