diff --git a/hosts/pi/default.nix b/hosts/pi/default.nix
index 4e424f4..825a610 100644
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@@ -83,15 +83,31 @@
     }];
   };
 
+  age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
+    file = "${inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
+    path = "${services.zigbee2mqtt.dataDir}/secret.yaml";
+  };
+
   services.zigbee2mqtt = {
     enable = true;
+    dataDir = "/var/lib/zigbee2mqtt";
     settings = {
       homeassistant = config.services.home-assistant.enable;
       frontend = true;
+      device_options = {
+        retain = true;
+      };
       serial = {
         port = "/dev/ttyUSB0";
       };
+      advanced = {
+        channel = 20;
+        network_key = "!secret.yaml network_key";
+        pan_id = 13001;
+        ext_pan_id = [ 79 1 73 47 250 136 124 222 ];
+      };
       mqtt = {
+        version = 5;
         server = "mqtt://localhost:1883";
       };
     };