Jetstream with custom User Model

I have custom user Model which PK is not id, the problem in Jetstream is TeamMemberManager::removeTeamMember calling Jetstream::findUserByIdOrFail which hardcode to id instead of PK defined in User Model That's why the feature test provided from jetstream failing

TeamMemberManager::updateRole also calling $this->managingRoleFor->id, but UpdateTeamMemberRole is not Contract, so is not replacable, which UpdateTeamMemberRole->update calling Jetstream::findUserByIdOrFail

Any idea to customize it properly ?