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