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