separating out build-images, improving image logging