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