Switch to mutability groupIds to avoid conflicts with upstream