diff --git a/CODEOWNERS b/CODEOWNERS
index b8f196e8714..b9ccecb76bf 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -7,47 +7,47 @@
 packages/animations/**                                   @hannah-hyj
 packages/camera/**                                       @bparrishMines
 packages/cross_file/**                                   @ditman
-packages/css_colors/**                                   @stuartmorgan
+packages/css_colors/**                                   @stuartmorgan-g
 packages/extension_google_sign_in_as_googleapis_auth/**  @ditman
-packages/file_selector/**                                @stuartmorgan
+packages/file_selector/**                                @stuartmorgan-g
 packages/flutter_adaptive_scaffold/**                    @gspencergoog
-packages/flutter_image/**                                @stuartmorgan
+packages/flutter_image/**                                @stuartmorgan-g
 packages/flutter_lints/**                                @chunhtai
 packages/flutter_markdown/**                             @domesticmouse
-packages/flutter_migrate/**                              @stuartmorgan
-packages/flutter_template_images/**                      @stuartmorgan
+packages/flutter_migrate/**                              @stuartmorgan-g
+packages/flutter_template_images/**                      @stuartmorgan-g
 packages/go_router/**                                    @chunhtai
 packages/go_router_builder/**                            @chunhtai
 packages/google_adsense/**                               @sokoloff06 @ditman
 packages/google_identity_services_web/**                 @ditman
-packages/google_maps_flutter/**                          @stuartmorgan
-packages/google_sign_in/**                               @stuartmorgan
+packages/google_maps_flutter/**                          @stuartmorgan-g
+packages/google_sign_in/**                               @stuartmorgan-g
 packages/image_picker/**                                 @tarrinneal
 packages/interactive_media_ads/**                        @bparrishMines
 packages/in_app_purchase/**                              @bparrishMines
-packages/local_auth/**                                   @stuartmorgan
+packages/local_auth/**                                   @stuartmorgan-g
 packages/metrics_center/**                               @christopherfujino
 packages/multicast_dns/**                                @vashworth
 packages/palette_generator/**                            @gspencergoog
-packages/path_provider/**                                @stuartmorgan
+packages/path_provider/**                                @stuartmorgan-g
 packages/pigeon/**                                       @tarrinneal
-packages/platform/**                                     @stuartmorgan
-packages/plugin_platform_interface/**                    @stuartmorgan
+packages/platform/**                                     @stuartmorgan-g
+packages/plugin_platform_interface/**                    @stuartmorgan-g
 packages/pointer_interceptor/**                          @ditman
-packages/process/**                                      @stuartmorgan
+packages/process/**                                      @stuartmorgan-g
 packages/quick_actions/**                                @bparrishMines
 packages/rfw/**                                          @Hixie
 packages/shared_preferences/**                           @tarrinneal
 packages/standard_message_codec/**                       @jonahwilliams
 packages/two_dimensional_scrollables/**                  @Piinks
-packages/url_launcher/**                                 @stuartmorgan
+packages/url_launcher/**                                 @stuartmorgan-g
 packages/vector_graphics/**                              @jonahwilliams
 packages/vector_graphics_codec/**                        @jonahwilliams
 packages/vector_graphics_compiler/**                     @jonahwilliams
 packages/video_player/**                                 @tarrinneal
 packages/web_benchmarks/**                               @yjbanov
 packages/webview_flutter/**                              @bparrishMines
-packages/xdg_directories/**                              @stuartmorgan
+packages/xdg_directories/**                              @stuartmorgan-g
 third_party/packages/cupertino_icons/**                  @MitchellGoodwin
 third_party/packages/cupertino_icons/test/goldens/**     @LongCatIsLooong
 third_party/packages/flutter_svg/**                      @domesticmouse