Use forked rivets-server