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