diff --git a/CODEOWNERS b/CODEOWNERS
index 53033126..62ec683f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,9 +2,12 @@
 *       @tcharding
 
 # Owners for specific directories
-/bitreq/        @oleonardolima @TheBlueMatt @tnull
-/client/        @jamillambert
-/jsonrpc/       @apoelstra
-/node/          @RCasatta
-/types/         @jamillambert
+/bitcoind/          @tcharding @jamillambert @RCasatta
+/bitreq/            @TheBlueMatt @tnull @oleonardolima 
+/client/            @tcharding @jamillambert
+/electrsd/          @RCasatta @tcharding @jamillambert
+/integration_test/  @tcharding @jamillambert
+/jsonrpc/           @apoelstra @tcharding @jamillambert
+/types/             @tcharding @jamillambert
+/verify/            @tcharding @jamillambert