correct config name
Merge branch 'master' into add-webserver