[master] Changed configuration to comply with server rules