[noticket] Change to using the organization group type instead of the publisher group type