Adjust crbserver dependencies