Configure server
Merge branch 'f/server-configuration' into develop