add build images WIP: extract utility methods