diff --git a/nix/configuration/roles/base/default.nix b/nix/configuration/roles/base/default.nix
index dbe9766..2f4a8cd 100644
--- a/nix/configuration/roles/base/default.nix
+++ b/nix/configuration/roles/base/default.nix
@@ -5,6 +5,16 @@
   ...
 }:
 
+let
+  patchScriptBin =
+    filename: contents:
+    ((pkgs.writeScriptBin filename contents).overrideAttrs (old: {
+      buildCommand = "${old.buildCommand}\n patchShebangs $out";
+    }));
+  cleanup_temporary_files = (
+    patchScriptBin "cleanup_temporary_files" (builtins.readFile ./files/cleanup_temporary_files.bash)
+  );
+in
 {
   imports = [ ];
 
@@ -45,6 +55,7 @@
       gptfdisk # for cgdisk
       nix-output-monitor # For better view into nixos-rebuild
       nix-serve-ng # Serve nix store over http
+      cleanup_temporary_files
     ];
   };
 }
diff --git a/nix/configuration/roles/base/files/cleanup_temporary_files.bash b/nix/configuration/roles/base/files/cleanup_temporary_files.bash
new file mode 100644
index 0000000..43918b0
--- /dev/null
+++ b/nix/configuration/roles/base/files/cleanup_temporary_files.bash
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+#
+# Delete temporary files on entire disk
+find / -type f '(' -name '*.orig' -or -name '*~' -or -name '*.core' ')' -delete -print 2>/dev/null