diff --git a/flake.nix b/flake.nix
index bff4973d6..44d8be699 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,18 +57,10 @@
       # for backward compatibility, is safe to delete, not referenced anywhere
       overlay = self.overlays.default;
 
-      hydraJobs =
+      hydraEmacsen =
         lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
         let
           mkHydraJobs = pkgs:
-            let
-              inherit (pkgs) lib;
-
-              filterNonDrvAttrs = s: lib.mapAttrs (_: v: if (lib.isDerivation v) then v else filterNonDrvAttrs v) (lib.filterAttrs (_: v: lib.isDerivation v || (builtins.typeOf v == "set" && ! builtins.hasAttr "__functor" v)) s);
-
-              mkEmacsSet = emacs: filterNonDrvAttrs (pkgs.recurseIntoAttrs (pkgs.emacsPackagesFor emacs));
-
-            in
             {
               emacsen = {
                 inherit (pkgs) emacs-unstable emacs-unstable-nox;
@@ -79,9 +71,6 @@
                 inherit (pkgs) emacs-lsp;
                 inherit (pkgs) commercial-emacs;
               };
-
-              packages = mkEmacsSet pkgs.emacs;
-              packages-unstable = mkEmacsSet pkgs.emacs-unstable;
             };
 
         in
@@ -90,6 +79,23 @@
           "unstable" = mkHydraJobs (importPkgs nixpkgs { inherit system; });
         });
 
+      hydraPackageSet =
+        lib.genAttrs [ "x86_64-linux" ] (system:
+        let
+          mkHydraJobs = pkgs:
+            let
+              inherit (pkgs) lib;
+              filterNonDrvAttrs = s: lib.mapAttrs (_: v: if (lib.isDerivation v) then v else filterNonDrvAttrs v) (lib.filterAttrs (_: v: lib.isDerivation v || (builtins.typeOf v == "set" && ! builtins.hasAttr "__functor" v)) s);
+              mkEmacsSet = emacs: filterNonDrvAttrs (pkgs.recurseIntoAttrs (pkgs.emacsPackagesFor emacs));
+            in
+            {
+              packages = mkEmacsSet pkgs.emacs;
+            };
+        in
+        {
+          "unstable" = mkHydraJobs (importPkgs nixpkgs { inherit system; });
+        });
+
       packages = forAllSystems (system: packages'.${system}.packages);
       lib = forAllSystems (system: packages'.${system}.lib);
     };