Yes it makes sense to use per team tokens since the beginning.