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