diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5852865f94..1d4fbfea56 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,25 +1,36 @@
 # Lines starting with '#' are comments.
 # Each line is a file pattern followed by one or more owners.
 
-accounts/usbwallet              @karalabe
+accounts/usbwallet              @gballet
 accounts/scwallet               @gballet
 accounts/abi                    @gballet @MariusVanDerWijden
-beacon/engine                   @lightclient
+beacon/engine                   @MariusVanDerWijden @lightclient @fjl
+beacon/light                    @zsfelfoldi
+beacon/merkle                   @zsfelfoldi 
+beacon/types                    @zsfelfoldi @fjl
+beacon/params                   @zsfelfoldi @fjl
 cmd/clef                        @holiman
 cmd/evm                         @holiman @MariusVanDerWijden @lightclient
-consensus                       @karalabe
-core/                           @karalabe @holiman @rjl493456442
-eth/                            @karalabe @holiman @rjl493456442
-eth/catalyst/                   @gballet @lightclient
+core/state                      @rjl493456442 @holiman
+crypto/                         @gballet @jwasinger @holiman @fjl
+core/                           @holiman @rjl493456442
+eth/                            @holiman @rjl493456442
+eth/catalyst/                   @MariusVanDerWijden @lightclient @fjl @jwasinger
 eth/tracers/                    @s1na
+ethclient/                      @fjl
+ethdb/                          @rjl493456442
+event/                          @fjl
+trie/                           @rjl493456442
+triedb/                         @rjl493456442
 core/tracing/                   @s1na
 graphql/                        @s1na
-internal/ethapi                 @lightclient
+internal/ethapi                 @fjl @s1na @lightclient
 internal/era                    @lightclient
-les/                            @zsfelfoldi @rjl493456442
-light/                          @zsfelfoldi @rjl493456442
+metrics/                        @holiman
+miner/                          @MariusVanDerWijden @holiman @fjl @rjl493456442
 node/                           @fjl
 p2p/                            @fjl @zsfelfoldi
+rlp/                            @fjl
 params/                         @fjl @holiman @karalabe @gballet @rjl493456442 @zsfelfoldi
 rpc/                            @fjl @holiman
 signer/                         @holiman