Slightly tweek configuration system to align with server deployment model