Updated to include build images