improving server-bootstrap role