diff --git a/system/cachix.nix b/system/cachix.nix
index 404dc87..07af177 100644
--- a/system/cachix.nix
+++ b/system/cachix.nix
@@ -1,8 +1,12 @@
-{ pkgs, config, ... }: {
+{ pkgs, lib, config, ... }: {
   services.cachix-watch-store = {
     enable = true;
     cacheName = "lelgenio";
     cachixTokenFile = config.age.secrets.lelgenio-cachix.path;
   };
-  systemd.services.cachix-watch-store-agent.serviceConfig.TimeoutStopSec = 3;
+  systemd.services.cachix-watch-store-agent = {
+    serviceConfig.TimeoutStopSec = 3;
+    # If we don't do this, cachix tends to timeout
+    serviceConfig.KillMode = lib.mkForce "control-group";
+  };
 }