Move to just 1 product role