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