Issue 118: Consolidating the server roles assignment.