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