Merge "Adjust server configs"