Update team management for upstream changes