diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ed59c98cc..6286617d0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,15 +4,20 @@
 accounts/usbwallet              @karalabe
 accounts/scwallet               @gballet
 accounts/abi                    @gballet
+cmd/clef                        @holiman
+cmd/puppeth                     @karalabe
 consensus                       @karalabe
-core/                           @karalabe @holiman
-eth/                            @karalabe
+core/                           @karalabe @holiman @rjl493456442
+dashboard/                      @kurkomisi
+eth/                            @karalabe @holiman @rjl493456442
 graphql/                        @gballet
-les/                            @zsfelfoldi
-light/                          @zsfelfoldi
-mobile/                         @karalabe
+les/                            @zsfelfoldi @rjl493456442
+light/                          @zsfelfoldi @rjl493456442
+mobile/                         @karalabe @ligi
 p2p/                            @fjl @zsfelfoldi
+rpc/                            @fjl @holiman
 p2p/simulations                 @zelig @nonsense @janos @justelad
 p2p/protocols                   @zelig @nonsense @janos @justelad
 p2p/testing                     @zelig @nonsense @janos @justelad
+signer/                         @holiman
 whisper/                        @gballet @gluk256