diff --git a/CODEOWNERS b/CODEOWNERS
index 0503aad1bd7..cb8f8278973 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,5 +1,4 @@
 # Technical writers
-doc                                                           @Jimbo4350 @newhoggy @olgahryniuk
 README.*                                                      @Jimbo4350 @newhoggy @olgahryniuk
 cardano-cli/README.md                                         @Jimbo4350 @newhoggy @olgahryniuk
 
@@ -16,37 +15,28 @@ cabal.project                                                 @Jimbo4350 @newhog
 
 
 # /doc folder and README.* needs to be owned by @docs-access
-doc                                                           @input-output-hk/docs-access
+doc/                                                          @input-output-hk/docs-access
+
 README.*                                                      @input-output-hk/docs-access
 
-bench/tx-generator                                            @deepfire @mgmeier @MarcFontaine
-bench                                                         @deepfire @denisshevchenko @jutaro @MarcFontaine @mgmeier @fmaste @cleverca22
-cardano-tracer                                                @deepfire @denisshevchenko
-nix/workbench                                                 @deepfire @denisshevchenko @jutaro @MarcFontaine @mgmeier @fmaste
-trace-dispatcher                                              @deepfire @denisshevchenko @jutaro @mgmeier
-trace-forward                                                 @deepfire @denisshevchenko @jutaro @mgmeier
-trace-resources                                               @deepfire @denisshevchenko @jutaro @mgmeier
+bench/                                                        @deepfire @jutaro @mgmeier @fmaste @cleverca22
+cardano-tracer/                                               @deepfire
+nix/workbench/                                                @deepfire @jutaro @mgmeier @fmaste
+trace-dispatcher/                                             @deepfire @jutaro @mgmeier
+trace-forward/                                                @deepfire @jutaro @mgmeier
+trace-resources/                                              @deepfire @jutaro @mgmeier
 Makefile                                                      @deepfire @mgmeier @fmaste
 *.mk                                                          @deepfire @mgmeier @fmaste
 
-nix                                                           @input-output-hk/devops @deepfire @mgmeier @fmaste
+nix/                                                          @input-output-hk/devops @deepfire @mgmeier @fmaste
 *.nix                                                         @input-output-hk/devops @deepfire @mgmeier @fmaste
 flake.lock                                                    @input-output-hk/devops @deepfire @mgmeier @fmaste
 
 .buildkite                                                    @Jimbo4350 @newhoggy @input-output-hk/devops
 .github                                                       @Jimbo4350 @newhoggy @input-output-hk/devops
-ci                                                            @Jimbo4350 @newhoggy @input-output-hk/devops
-configuration                                                 @Jimbo4350 @newhoggy @input-output-hk/devops
+ci/                                                           @Jimbo4350 @newhoggy @input-output-hk/devops
+configuration/                                                @Jimbo4350 @newhoggy @input-output-hk/devops
 bors.toml                                                     @Jimbo4350 @newhoggy @input-output-hk/devops
 docker-compose.yml                                            @Jimbo4350 @newhoggy @input-output-hk/devops
-cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs   @Jimbo4350 @newhoggy @input-output-hk/devops @coot
-cardano-node/src/Cardano/Node/Configuration/Logging.hs        @Jimbo4350 @newhoggy @input-output-hk/devops
-cardano-node/src/Cardano/Node/Configuration/Socket.hs         @Jimbo4350 @newhoggy @input-output-hk/devops
-cardano-node/src/Cardano/Node/Tracing                         @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro
-cardano-node/src/Cardano/Node/Tracing/Tracers/Diffusion.hs    @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot
-cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToClient.hs @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot
-cardano-node/src/Cardano/Node/Tracing/Tracers/NodeToServer.hs @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot
-cardano-node/src/Cardano/Node/Tracing/Tracers/NonP2P.hs       @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot
-cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs          @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot
-cardano-node/src/Cardano/Node/Tracing/Tracers/Peer.hs         @Jimbo4350 @newhoggy @deepfire @denisshevchenko @jutaro @coot
-cardano-node/src/Cardano/Node/Run.hs                          @Jimbo4350 @newhoggy @input-output-hk/devops
+cardano-node/src/Cardano/Node/Tracing/                        @Jimbo4350 @newhoggy @deepfire @jutaro @coot
+cardano-node/src/Cardano/Tracing/OrphanInstances/             @Jimbo4350 @newhoggy @input-output-hk/devops @coot
\ No newline at end of file