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