Merge "[COMMON][DGBuilder] Uses new tpls for repos / images"