diff --git a/hive.nix b/hive.nix
index 39935e9..a255725 100644
--- a/hive.nix
+++ b/hive.nix
@@ -50,6 +50,10 @@ in
           settings.nix-path = config.nix.nixPath;
           package = pkgs.lix;
         };
+        services.openssh.settings = {
+          ClientAliveInterval = 60;
+          ClientAliveCountMax = 1;
+        };
         system.build.anywhere = pkgs.writeShellApplication {
           name = "anywhere-deploy_${name}.sh";
           runtimeInputs = [ pkgs.nixos-anywhere ];
diff --git a/machines/kat-mail-test/disks.nix b/machines/kat-mail-test/disks.nix
index ed9ef70..6c59a85 100644
--- a/machines/kat-mail-test/disks.nix
+++ b/machines/kat-mail-test/disks.nix
@@ -22,6 +22,7 @@
                 type = "filesystem";
                 format = "bcachefs";
                 mountpoint = "/";
+                mountOptions = [ "fsck" "fix_errors" ];
               };
             };
           };
diff --git a/machines/kat-manah/hardware-configuration.nix b/machines/kat-manah/hardware-configuration.nix
index 4ea7aa8..cbdb4ea 100644
--- a/machines/kat-manah/hardware-configuration.nix
+++ b/machines/kat-manah/hardware-configuration.nix
@@ -26,6 +26,7 @@
   fileSystems."/" = {
     device = "UUID=2d6f7d3a-936d-457c-86c7-f49d816ff5b7";
     fsType = "bcachefs";
+    options = [ "fsck" "fix_errors" ];
   };
 
   fileSystems."/boot" = {
diff --git a/machines/kat-probook/hardware-configuration.nix b/machines/kat-probook/hardware-configuration.nix
index 6d0257f..28e4608 100644
--- a/machines/kat-probook/hardware-configuration.nix
+++ b/machines/kat-probook/hardware-configuration.nix
@@ -27,6 +27,7 @@
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/4c1f76c6-5ce6-4987-b15e-9419627b7f19";
     fsType = "bcachefs";
+    options = [ "fsck" "fix_errors" ];
   };
 
   boot.initrd.luks.devices."dec-lin" = {
diff --git a/machines/kat-son/disks.nix b/machines/kat-son/disks.nix
index ed9ef70..6c59a85 100644
--- a/machines/kat-son/disks.nix
+++ b/machines/kat-son/disks.nix
@@ -22,6 +22,7 @@
                 type = "filesystem";
                 format = "bcachefs";
                 mountpoint = "/";
+                mountOptions = [ "fsck" "fix_errors" ];
               };
             };
           };
diff --git a/machines/kat-traque/disks.nix b/machines/kat-traque/disks.nix
index ed9ef70..6c59a85 100644
--- a/machines/kat-traque/disks.nix
+++ b/machines/kat-traque/disks.nix
@@ -22,6 +22,7 @@
                 type = "filesystem";
                 format = "bcachefs";
                 mountpoint = "/";
+                mountOptions = [ "fsck" "fix_errors" ];
               };
             };
           };
diff --git a/machines/kat-virt/default.nix b/machines/kat-virt/default.nix
index c1301ea..b91208e 100644
--- a/machines/kat-virt/default.nix
+++ b/machines/kat-virt/default.nix
@@ -1,5 +1,3 @@
-# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
 {
   config,
   lib,
diff --git a/machines/kat-virt/hardware-configuration.nix b/machines/kat-virt/hardware-configuration.nix
index a2f4b2b..2833b40 100644
--- a/machines/kat-virt/hardware-configuration.nix
+++ b/machines/kat-virt/hardware-configuration.nix
@@ -26,6 +26,7 @@
   fileSystems."/" = {
     device = "UUID=301a23cf-1aa3-4c53-a174-1a97592da5fa";
     fsType = "bcachefs";
+    options = [ "fsck" "fix_errors" ];
   };
 
   fileSystems."/boot" = {
diff --git a/machines/kat-watcher/disks.nix b/machines/kat-watcher/disks.nix
index 538d355..3c17db8 100644
--- a/machines/kat-watcher/disks.nix
+++ b/machines/kat-watcher/disks.nix
@@ -28,6 +28,7 @@
                 format = "bcachefs";
                 mountpoint = "/";
                 extraArgs = [ "--compression=zstd" ];
+                mountOptions = [ "fsck" "fix_errors" ];
               };
             };
           };