Change where message bus is

Isn't a global common concern