add build images WIP: add build images rewrite validations