Merge "[MODELING] Uses new tpls for repos / images"