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