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