diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index fda634868414e0..a54091e4745989 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,10 +15,6 @@
 # Blocks
 /packages/block-library                         @ajitbohra
 /packages/block-library/src/gallery             @geriux
-/packages/block-library/src/navigation          @tellthemachines
-/packages/block-library/src/navigation-link     @tellthemachines
-/packages/block-library/src/navigation-submenu  @tellthemachines
-/packages/block-library/src/page-list           @tellthemachines
 /packages/block-library/src/comment-template    @michalczaplinski
 /packages/block-library/src/comments            @michalczaplinski
 /packages/block-library/src/table-of-contents   @ZebulanStanphill
@@ -34,6 +30,8 @@
 /packages/annotations                           @atimmer
 /packages/autop
 /packages/block-editor                          @ellatrix
+/packages/block-editor/src/hooks                @tellthemachines
+/packages/block-editor/src/layouts              @tellthemachines
 /packages/block-serialization-spec-parser       @dmsnell
 /packages/block-serialization-default-parser    @dmsnell
 /packages/blocks
@@ -49,7 +47,7 @@
 /packages/block-editor/src/components/link-control  @getdave
 
 # Widgets
-/packages/edit-widgets                          @draganescu @talldan @tellthemachines @adamziel @kevin940726
+/packages/edit-widgets                          @draganescu @talldan @adamziel @kevin940726
 /packages/customize-widgets
 /packages/widgets
 
@@ -136,6 +134,8 @@
 
 # PHP
 /lib                                            @spacedmonkey
+/lib/block-supports/layout.php                  @tellthemachines
+/lib/class-wp-theme-json-gutenberg.php          @tellthemachines
 /lib/compat/*/html-api                          @dmsnell
 /lib/experimental/rest-api.php                  @timothybjacobs
 /lib/experimental/class-wp-rest-*               @timothybjacobs