diff --git a/m/common/main.nix b/m/common/main.nix
index 5d77ddc..f9141aa 100644
--- a/m/common/main.nix
+++ b/m/common/main.nix
@@ -10,6 +10,7 @@
     ./slurm.nix
     ./ssh.nix
     ./users.nix
+    ./watchdog.nix
   ];
 
   nixpkgs.overlays = [
diff --git a/m/common/watchdog.nix b/m/common/watchdog.nix
new file mode 100644
index 0000000..d4d297d
--- /dev/null
+++ b/m/common/watchdog.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  # The boards have a BMC watchdog controlled by IPMI
+  boot.kernelModules = [ "ipmi_watchdog" ];
+
+  # Enable systemd watchdog with 30 s interval
+  systemd.watchdog.runtimeTime = "30s";
+}