diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bb50e4d42e85..4c68ee69fac6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -451,7 +451,6 @@ mapAliases ({
   linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
   linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
   linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
-  linuxPackages_5_12 = linuxKernel.packages.linux_5_12;
   linuxPackages_5_13 = linuxKernel.packages.linux_5_13;
 
   linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
@@ -467,7 +466,6 @@ mapAliases ({
   linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
   linux_5_10 = linuxKernel.kernels.linux_5_10;
   linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
-  linux_5_12 = linuxKernel.kernels.linux_5_12;
   linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11;
 
   # added 2020-04-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68bc442ac46c..070332847d0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21138,10 +21138,10 @@ with pkgs;
   linux_4_14_hardened = linuxPackages_4_14_hardened.kernel;
   linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened;
   linux_4_19_hardened = linuxPackages_4_19_hardened.kernel;
-  linuxPackages_5_4_hardened = linuxKernel.linux_5_4_hardened.linux_latest_hardened;
-  linux_5_4_hardened = linuxPackages_5_4_hardened.kernel;
+  linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened;
+  linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened;
   linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened;
-  linux_5_10_hardened = linuxPackages_5_10_hardened.kernel;
+  linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened;
 
   # Hardkernel (Odroid) kernels.
   linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 85929255b186..2bae5140b14e 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -189,6 +189,13 @@ let
 
     linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel;
 
+    linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
+
+    linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { };
+    linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };
+    linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
+    linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
+
   });
   /*  Linux kernel modules are inherently tied to a specific kernel.  So
     rather than provide specific instances of those packages for a
@@ -417,9 +424,9 @@ let
   });
 
   # Hardened Linux
-  hardenedPackagesFor = kernel': overrides:
+  hardenedKernelFor = kernel': overrides:
     let kernel = kernel'.override overrides;
-    in packagesFor (kernel.override {
+    in kernel.override {
       structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {
         inherit lib;
         inherit (kernel) version;
@@ -429,7 +436,8 @@ let
       ];
       modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra;
       isHardened = true;
-  });
+  };
+  hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);
 
   vanillaPackages = {
     # recurse to build modules for the kernels