diff --git a/machines/ci-runner/hardware-configuration.nix b/machines/ci-runner/hardware-configuration.nix
index 4df2ffd..75ef939 100644
--- a/machines/ci-runner/hardware-configuration.nix
+++ b/machines/ci-runner/hardware-configuration.nix
@@ -39,6 +39,8 @@
     };
   };
 
+  services.fstrim.enable = true;
+
   networking = {
     useDHCP = false;
     usePredictableInterfaceNames = false;
diff --git a/machines/koyomi/hardware-configuration.nix b/machines/koyomi/hardware-configuration.nix
index 949f7b2..da29334 100644
--- a/machines/koyomi/hardware-configuration.nix
+++ b/machines/koyomi/hardware-configuration.nix
@@ -57,6 +57,9 @@
 
   services.prometheus.exporters.smartctl.devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ];
 
+  # Not used for boot, but required to make thin LVs work
+  services.lvm.boot.thin.enable = true;
+
   # TODO Enable periodic RAID scrubbing/checking with mdcheck
 
   networking.useDHCP = false;