diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a65718da81..d78346322c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,16 +1,25 @@
-# Order matters
-# below ones takes precedence over the upper ones
+# Order matters: entries that are further down override any entries above them
 
-# Global owners
-*                                 @nazar-pc @rg3l3dr
-
-/crates                           @nazar-pc @rg3l3dr
-/crates/pallet-*                  @nazar-pc @rg3l3dr @vedhavyas @NingLin-P
-/crates/sp-*                      @nazar-pc @rg3l3dr @vedhavyas @NingLin-P
-/crates/subspace-archiving        @shamil-gadelshin @nazar-pc @rg3l3dr
-/crates/subspace-farmer           @nazar-pc @shamil-gadelshin @rg3l3dr
-/crates/subspace-networking       @shamil-gadelshin @nazar-pc @rg3l3dr
-/crates/subspace-runtime*         @vedhavyas @nazar-pc @rg3l3dr
-/crates/subspace-node             @NingLin-P @nazar-pc @rg3l3dr @vedhavyas
-/crates/substrate                 @nazar-pc @rg3l3dr
-/domains                          @vedhavyas @NingLin-P @nazar-pc @rg3l3dr
+/.github/workflows                @nazar-pc
+/crates/pallet-*                  @NingLin-P @vedhavyas
+/crates/pallet-subspace           @NingLin-P @vedhavyas @nazar-pc
+/crates/sc-consensus-*            @nazar-pc
+/crates/sc-proof-of-time          @nazar-pc
+/crates/sp-*                      @NingLin-P @vedhavyas
+/crates/sp-consensus-subspace     @NingLin-P @vedhavyas @nazar-pc
+/crates/subspace-archiving        @nazar-pc @shamil-gadelshin
+/crates/subspace-core-primitives  @nazar-pc
+/crates/subspace-erasure-coding   @nazar-pc
+/crates/subspace-farmer*          @nazar-pc @shamil-gadelshin
+/crates/subspace-networking       @nazar-pc @shamil-gadelshin
+/crates/subspace-proof-*          @nazar-pc
+/crates/subspace-rpc-primitives   @nazar-pc
+/crates/subspace-runtime*         @vedhavyas @nazar-pc
+/crates/subspace-service          @nazar-pc
+/crates/subspace-node             @NingLin-P @vedhavyas @nazar-pc
+/crates/subspace-verification     @nazar-pc
+/docker                           @nazar-pc
+/domains                          @NingLin-P @vedhavyas
+/shared/subspace-kzg              @nazar-pc
+/shared/subspace-proof-*          @nazar-pc
+/Cargo.toml                       @nazar-pc