Update with the mqtt configurations

Please review and merge