diff --git a/instances/heimdall/configuration.nix b/instances/heimdall/configuration.nix
index e9293f8..a2d12b8 100644
--- a/instances/heimdall/configuration.nix
+++ b/instances/heimdall/configuration.nix
@@ -88,12 +88,12 @@ in
         address = "127.0.0.1";
         port = 1883;
         omitPasswordAuth = true;
-        users.iotdevice = {
+        users.zigbee2mqtt = {
           acl = [
             # "pattern readwrite #"
             "readwrite #"
           ];
-          password = "mysweetpassword-or-use-hashedPassword";
+          password = "zigbee2mqtt";
         };
       }];
     };
@@ -101,6 +101,7 @@ in
       enable = true;
       settings = {
         homeassistant = config.services.home-assistant.enable;
+        mqtt.user = "zigbee2mqtt";
         frontend = true;
         permit_join = true;
         serial = {