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