diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 369eba9324734..a49bd40fce1b5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,6 +8,7 @@
 /packages/core-data                             @youknowriad @nerrad
 /packages/data                                  @youknowriad @nerrad @coderkevin
 /packages/redux-routine                         @youknowriad @nerrad
+/packages/data-controls                         @nerrad @aduth
 
 # Blocks
 /packages/block-library                         @Soean @ajitbohra @jorgefilipecosta @talldan
@@ -26,10 +27,20 @@
 /packages/editor
 /packages/list-reusable-blocks                  @youknowriad @noisysocks
 /packages/shortcode
+/packages/block-directory
+/packages/interface
+/packages/media-utils
+/packages/server-side-render
 
 # Widgets
 /packages/edit-widgets                          @youknowriad
 
+# Navigation
+/packages/edit-navigation
+
+# Full Site Editing
+/packages/edit-site
+
 # Tooling
 /bin                                            @ntwb @nerrad @ajitbohra
 /bin/api-docs                                   @ntwb @nerrad @ajitbohra @nosolosw
@@ -51,6 +62,8 @@
 /packages/npm-package-json-lint-config          @gziolo @ntwb @nerrad @ajitbohra
 /packages/postcss-themes                        @youknowriad @ntwb @nerrad @ajitbohra
 /packages/scripts                               @youknowriad @gziolo @ntwb @nerrad @ajitbohra
+/packages/dependency-extraction-webpack-plugin  @gziolo
+/packages/prettier-config                       @ntwb @gziolo @aduth
 
 # UI Components
 /packages/components                            @youknowriad @ajitbohra @jaymanpandya @jorgefilipecosta @chrisvanpatten
@@ -59,6 +72,9 @@
 /packages/notices                               @ajitbohra @jaymanpandya @jorgefilipecosta
 /packages/nux                                   @ajitbohra @jaymanpandya @jorgefilipecosta @noisysocks
 /packages/viewport                              @youknowriad @ajitbohra @jaymanpandya @jorgefilipecosta
+/packages/base-styles
+/packages/icons
+/packages/primitives
 
 # Utilities
 /packages/a11y                                  @youknowriad @aduth
@@ -76,6 +92,8 @@
 /packages/token-list                            @aduth
 /packages/url                                   @talldan @aduth
 /packages/wordcount                             @aduth
+/packages/warning
+/packages/keyboard-shortcuts
 
 # Extensibility
 /packages/hooks                                 @gziolo @adamsilverstein
@@ -86,6 +104,10 @@
 /packages/rich-text                             @ellatrix @jorgefilipecosta @daniloercoli @sergioestevao @etoledom
 /packages/block-editor/src/components/rich-text @ellatrix @jorgefilipecosta @daniloercoli @sergioestevao @etoledom
 
+# Project Management
+/.github                                        @youknowriad @mapk @karmatosed
+/packages/project-management-automation         @aduth
+
 # wp-env
 /packages/env                                   @epiqueras @noahtallen @noisysocks
 
@@ -99,6 +121,3 @@
 *.native.scss                                   @ghost
 *.android.scss                                  @ghost
 *.ios.scss                                      @ghost
-
-# Project Management
-/.github                                        @youknowriad @mapk @karmatosed