diff --git a/nixos/machines/driftwood/configuration.nix b/nixos/machines/driftwood/configuration.nix
index 0b479ad..6df213e 100644
--- a/nixos/machines/driftwood/configuration.nix
+++ b/nixos/machines/driftwood/configuration.nix
@@ -77,4 +77,11 @@
       upper = "05:00";
     };
   };
+
+  # Setup garbage collection, keep the past month
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+      options = "--delete-older-than 30d";
+  };
 }
diff --git a/nixos/modules/base.nix b/nixos/modules/base.nix
index b7788cc..a8da9b8 100644
--- a/nixos/modules/base.nix
+++ b/nixos/modules/base.nix
@@ -39,4 +39,6 @@
 "https://nix-community.cachix.org"
     ];
   };
+  # Remote builds should use subsitutors
+  nix.extraOptions = "builders-use-substitutes = true";
 }