diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5376d51a6178..9b2fdd85c31d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -55,6 +55,15 @@
 # NixOS integration test driver
 /nixos/lib/test-driver  @tfc
 
+# NixOS hardware descriptions
+/nixos/hardware/beagleboard/pocketbeagle @yegortimoshenko
+/nixos/hardware/dell/xps/13-9370 @moredread
+/nixos/hardware/dell/xps/13-9380 @kalbasit
+/nixos/hardware/lenovo/thinkpad/x230 @makefu @yegortimoshenko
+/nixos/hardware/lenovo/thinkpad/x250 @Mic92
+/nixos/hardware/pcengines/apu @yegortimoshenko
+/nixos/hardware/purism/librem/13v3 @yegortimoshenko
+
 # Updaters
 ## update.nix
 /maintainers/scripts/update.nix   @jtojnar
diff --git a/nixos/hardware/CODEOWNERS b/nixos/hardware/CODEOWNERS
index 4f2bb2cc6463..e69de29bb2d1 100644
--- a/nixos/hardware/CODEOWNERS
+++ b/nixos/hardware/CODEOWNERS
@@ -1,7 +0,0 @@
-beagleboard/pocketbeagle @yegortimoshenko
-dell/xps/13-9370 @moredread
-dell/xps/13-9380 @kalbasit
-lenovo/thinkpad/x230 @makefu @yegortimoshenko
-lenovo/thinkpad/x250 @Mic92
-pcengines/apu @yegortimoshenko
-purism/librem/13v3 @yegortimoshenko