diff --git a/flake.nix b/flake.nix
index 922b378..6894de8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,17 +10,7 @@
       let
         pkgs = nixpkgs.legacyPackages.${system};
         kernel = pkgs.linux_latest;
-        packagePaths = {
-          ethercat = "./ethercat.nix";
-          testmanager = "./testmanager.nix";
-          dls = "./dls.nix";
-          etherlab = "./etherlab.nix";
-          qtpdwidgets = "./qtpdwidgets.nix";
-          pdcom = "./pdcom.nix";
-          pdserv = "./pdserv.nix";
-        };
-      in
-      {
+      in rec {
         packages.default = pkgs.callPackage ./ethercat.nix { inherit kernel; };
         packages.ethercat = pkgs.callPackage ./ethercat.nix { inherit kernel; };
         packages.testmanager = pkgs.libsForQt5.callPackage ./testmanager.nix {};
@@ -29,7 +19,15 @@
         packages.qtpdwidgets = pkgs.libsForQt5.callPackage ./qtpdwidgets.nix {};
         packages.pdcom = pkgs.callPackage ./pdcom.nix {};
         packages.pdserv = pkgs.callPackage ./pdserv.nix {};
-        overlay = final: prev: (nixpkgs.lib.mapAttrs (n: v: prev.callPackage v { }) packagePaths);
+        overlay = final: prev: {
+          ethercat = packages.ethercat;
+          testmanager = packages.testmanager;
+          dls = packages.dls;
+          etherlab = packages.etherlab;
+          qtpdqidgets = packages.qtpdqidgets;
+          pdcom = packages.pdcom;
+          pdserv = packages.pdserv;
+        };
       }
     );
 }