diff --git a/pkgs/applications/networking/cluster/kubeval/schema.nix b/pkgs/by-name/ku/kubeval-schema/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/kubeval/schema.nix
rename to pkgs/by-name/ku/kubeval-schema/package.nix
diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/by-name/ku/kubeval/package.nix
similarity index 80%
rename from pkgs/applications/networking/cluster/kubeval/default.nix
rename to pkgs/by-name/ku/kubeval/package.nix
index a27d056d10a9..e48c67c5dc0b 100644
--- a/pkgs/applications/networking/cluster/kubeval/default.nix
+++ b/pkgs/by-name/ku/kubeval/package.nix
@@ -5,15 +5,15 @@
   fetchpatch,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "kubeval";
   version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "instrumenta";
     repo = "kubeval";
-    rev = "v${version}";
-    sha256 = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-pwJOV7V78H2XaMiiJvKMcx0dEwNDrhgFHmCRLAwMirg=";
   };
 
   patches = [
@@ -21,7 +21,7 @@ buildGoModule rec {
     (fetchpatch {
       name = "bump-golang.org/x/sys.patch";
       url = "https://github.com/instrumenta/kubeval/commit/d64502b04d9e1b85fd3d5509049adb50f3e39954.patch";
-      sha256 = "sha256-S/lgwdykFLU2QZRW927fgCPxaIAMK3vSqmH08pXBQxM=";
+      hash = "sha256-S/lgwdykFLU2QZRW927fgCPxaIAMK3vSqmH08pXBQxM=";
     })
   ];
 
@@ -39,4 +39,4 @@ buildGoModule rec {
       nicknovitski
     ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e8cdb71347f..185db1682aaa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9309,10 +9309,6 @@ with pkgs;
     callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop
       { };
 
-  kubeval = callPackage ../applications/networking/cluster/kubeval { };
-
-  kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { };
-
   kubectl-convert = kubectl.convert;
 
   kubectl-view-allocations =