Use serverConfiguration

Merge need to be done after release