Added new server declarations and roles refs for prod #9676