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