Add a few more servers and roles to our definition of CVL