Merge "[COMMON][NAMEGEN] Uses new tpls for repos / images"