diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index df5de975fac4f4..d156343b970196 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,7 +14,7 @@
 /packages/block-serialization-default-parser    @youknowriad @gziolo @aduth
 /packages/blocks                                @youknowriad @gziolo @aduth @noisysocks
 /packages/edit-post                             @youknowriad @gziolo @talldan @noisysocks
-/packages/editor                                @youknowriad @gziolo @nosolosw @talldan @noisysocks
+/packages/editor                                @youknowriad @gziolo @talldan @noisysocks
 /packages/list-reusable-blocks                  @youknowriad @aduth @noisysocks
 /packages/shortcode                             @youknowriad @aduth
 
@@ -27,17 +27,17 @@
 /packages/custom-templated-path-webpack-plugin  @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
 /packages/e2e-test-utils                        @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
 /packages/e2e-tests                             @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @talldan
-/packages/eslint-plugin                         @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
+/packages/eslint-plugin                         @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
 /packages/jest-console                          @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
 /packages/jest-preset-default                   @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
 /packages/jest-puppeteer-axe                    @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
 /packages/library-export-default-webpack-plugin @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
 /packages/npm-package-json-lint-config          @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
 /packages/postcss-themes                        @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
-/packages/scripts                               @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
+/packages/scripts                               @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
 
 # UI Components
-/packages/components                            @youknowriad @gziolo @aduth @chrisvanpatten @ajitbohra @jaymanpandya @nosolosw @jorgefilipecosta @talldan @noisysocks
+/packages/components                            @youknowriad @gziolo @aduth @chrisvanpatten @ajitbohra @jaymanpandya @jorgefilipecosta @talldan @noisysocks
 /packages/compose                               @youknowriad @gziolo @aduth @chrisvanpatten @ajitbohra @jaymanpandya @jorgefilipecosta @talldan @noisysocks
 /packages/element                               @youknowriad @gziolo @aduth @chrisvanpatten @ajitbohra @jaymanpandya @jorgefilipecosta @talldan @noisysocks
 /packages/notices                               @youknowriad @gziolo @aduth @chrisvanpatten @ajitbohra @jaymanpandya @jorgefilipecosta @talldan @noisysocks
@@ -49,7 +49,7 @@
 /packages/blob                                  @youknowriad @gziolo @aduth
 /packages/date                                  @youknowriad @gziolo @aduth
 /packages/deprecated                            @youknowriad @gziolo @aduth
-/packages/dom                                   @youknowriad @gziolo @aduth
+/packages/dom                                   @youknowriad @gziolo @aduth @nosolosw
 /packages/dom-ready                             @youknowriad @gziolo @aduth
 /packages/escape-html                           @youknowriad @gziolo @aduth
 /packages/html-entities                         @youknowriad @gziolo @aduth