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