More client and server yml updates