Moving Build image to a better place