diff --git a/flake.nix b/flake.nix
index d3edebb6..c39bdf49 100644
--- a/flake.nix
+++ b/flake.nix
@@ -230,6 +230,13 @@
           lib.recursiveUpdate result (extractZwHosts zentralwerk.lib.config.site.net."${net}")
         ) {} [ "core" "cluster" "c3d2" "serv" "flpk" "pub" ];
 
+        overlayList = [
+          fenix.overlays.default
+          heliwatch.overlay
+          naersk.overlay
+          self.overlays
+        ];
+
       # Our custom NixOS builder
       nixosSystem' =
         { nixpkgs ? inputs.nixos
@@ -247,9 +254,7 @@
               libz = nixos-modules.lib { inherit lib config; };
             };
 
-            nixpkgs.overlays = [
-              self.overlays
-            ];
+            nixpkgs.overlays = overlayList;
           })
 
           self.nixosModules.c3d2
@@ -266,13 +271,7 @@
         inherit (inputs) tracer bevy-mandelbrot bevy-julia;
       };
 
-      legacyPackages = lib.attrsets.mapAttrs (_: pkgs:
-        pkgs.appendOverlays [
-          fenix.overlays.default
-          heliwatch.overlay
-          naersk.overlay
-          self.overlays
-        ]) nixos.legacyPackages;
+      legacyPackages = lib.attrsets.mapAttrs (_: pkgs: pkgs.appendOverlays overlayList) nixos.legacyPackages;
 
       lib = { inherit hostRegistry; };