Cleanup a bit the way the server builder is override in the run command