diff --git a/hosts/radiobert/default.nix b/hosts/radiobert/default.nix
index aefc9af7..d4321906 100644
--- a/hosts/radiobert/default.nix
+++ b/hosts/radiobert/default.nix
@@ -37,7 +37,9 @@
         '';
       };
     };
-    kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages_5_13;
+    # Don't build ZFS for aarch64 (broken?)
+    supportedFilesystems = lib.mkForce [ "vfat" "ext4" ];
 
     tmpOnTmpfs = true;
   };
@@ -109,6 +111,12 @@
     SUBSYSTEM=="usb", MODE:="0666"
   '';
 
+  # Reboot on hang
+  systemd.watchdog = {
+    runtimeTime = "10s";
+    rebootTime = "15s";
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/lib/openwebrx.nix b/lib/openwebrx.nix
index f0947ddc..b0a7497c 100644
--- a/lib/openwebrx.nix
+++ b/lib/openwebrx.nix
@@ -24,13 +24,12 @@ in
     systemd.services.openwebrx = {
       wantedBy = [ "multi-user.target" ];
       path = [
-        cfg.package
         cfg.package.csdr
         pkgs.alsaUtils
         pkgs.netcat
       ];
       serviceConfig = {
-        ExecStart = "openwebrx";
+        ExecStart = "${cfg.package}/bin/openwebrx";
         Restart = "always";
         User = "openwebrx";
         Groups = "openwebrx";