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