diff --git a/TESTOWNERS b/TESTOWNERS
index ddf30ed2f1..95b3c0e856 100644
--- a/TESTOWNERS
+++ b/TESTOWNERS
@@ -84,7 +84,7 @@
 /dev/devicelab/bin/tasks/platform_channels_benchmarks.dart @gaaclarke @flutter/engine
 /dev/devicelab/bin/tasks/platform_views_scroll_perf__timeline_summary.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/platform_views_scroll_perf_impeller__timeline_summary.dart @bdero @flutter/engine
-/dev/devicelab/bin/tasks/plugin_dependencies_test.dart @stuartmorgan @flutter/tool
+/dev/devicelab/bin/tasks/plugin_dependencies_test.dart @stuartmorgan-g @flutter/tool
 /dev/devicelab/bin/tasks/routing_test.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/shader_mask_cache_perf__e2e_summary.dart @flar @flutter/engine
 /dev/devicelab/bin/tasks/spell_check_test_ios.dart @camsim99 @flutter/android
@@ -131,7 +131,7 @@
 /dev/devicelab/bin/tasks/cubic_bezier_perf_sksl_warmup__timeline_summary.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/cull_opacity_perf__timeline_summary.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/drive_perf_debug_warning.dart @jtmcdole @flutter/engine
-/dev/devicelab/bin/tasks/embedded_android_views_integration_test.dart @stuartmorgan @flutter/plugin
+/dev/devicelab/bin/tasks/embedded_android_views_integration_test.dart @stuartmorgan-g @flutter/plugin
 /dev/devicelab/bin/tasks/external_textures_integration_test.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/fading_child_animation_perf__timeline_summary.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart @jtmcdole @flutter/engine
@@ -143,7 +143,7 @@
 /dev/devicelab/bin/tasks/hello_world_impeller.dart @gaaclarke @flutter/engine
 /dev/devicelab/bin/tasks/home_scroll_perf__timeline_summary.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/hot_mode_dev_cycle__benchmark.dart @bkonyi @flutter/tool
-/dev/devicelab/bin/tasks/hybrid_android_views_integration_test.dart @stuartmorgan @flutter/plugin
+/dev/devicelab/bin/tasks/hybrid_android_views_integration_test.dart @stuartmorgan-g @flutter/plugin
 /dev/devicelab/bin/tasks/imagefiltered_transform_animation_perf__timeline_summary.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/integration_test_test.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/integration_ui_driver.dart @bkonyi @flutter/tool
@@ -158,7 +158,7 @@
 /dev/devicelab/bin/tasks/new_gallery_opengles_impeller__transition_perf.dart @gaaclarke @flutter/engine
 /dev/devicelab/bin/tasks/picture_cache_perf__timeline_summary.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/platform_channel_sample_test.dart @jtmcdole @flutter/engine
-/dev/devicelab/bin/tasks/platform_interaction_test.dart @stuartmorgan @flutter/plugin
+/dev/devicelab/bin/tasks/platform_interaction_test.dart @stuartmorgan-g @flutter/plugin
 /dev/devicelab/bin/tasks/platform_view__start_up.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/run_release_test.dart @bkonyi @flutter/tool
 /dev/devicelab/bin/tasks/service_extensions_test.dart @bkonyi @flutter/tool
@@ -201,7 +201,7 @@
 /dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart @vashworth @flutter/tool
 /dev/devicelab/bin/tasks/ios_defines_test.dart @louisehsu @flutter/tool
 /dev/devicelab/bin/tasks/ios_picture_cache_complexity_scoring_perf__timeline_summary.dart @flar @flutter/engine
-/dev/devicelab/bin/tasks/ios_platform_view_tests.dart @stuartmorgan @flutter/plugin
+/dev/devicelab/bin/tasks/ios_platform_view_tests.dart @stuartmorgan-g @flutter/plugin
 /dev/devicelab/bin/tasks/large_image_changer_perf_ios.dart @jtmcdole @flutter/engine
 /dev/devicelab/bin/tasks/microbenchmarks_ios.dart @louisehsu @flutter/engine
 /dev/devicelab/bin/tasks/native_assets_android.dart @dcharkes @flutter/android
@@ -213,7 +213,7 @@
 /dev/devicelab/bin/tasks/platform_channel_sample_test_swift.dart @hellohuanlin @flutter/engine
 /dev/devicelab/bin/tasks/platform_channels_benchmarks_ios.dart @gaaclarke @flutter/engine
 /dev/devicelab/bin/tasks/platform_interaction_test_ios.dart @hellohuanlin @flutter/engine
-/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @stuartmorgan @flutter/plugin
+/dev/devicelab/bin/tasks/platform_view_ios__start_up.dart @stuartmorgan-g @flutter/plugin
 /dev/devicelab/bin/tasks/platform_views_scroll_perf_ad_banners__timeline_summary.dart @hellohuanlin @flutter/engine
 /dev/devicelab/bin/tasks/platform_views_scroll_perf_bottom_ad_banner__timeline_summary.dart @hellohuanlin @flutter/engine
 /dev/devicelab/bin/tasks/platform_views_scroll_perf_ios__timeline_summary.dart @hellohuanlin @flutter/engine
@@ -243,7 +243,7 @@
 /dev/devicelab/bin/tasks/complex_layout_scroll_perf_macos__timeline_summary.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/complex_layout_win_desktop__compile.dart @yaakovschectman @flutter/desktop
 /dev/devicelab/bin/tasks/complex_layout_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
-/dev/devicelab/bin/tasks/dart_plugin_registry_test.dart @stuartmorgan @flutter/plugin
+/dev/devicelab/bin/tasks/dart_plugin_registry_test.dart @stuartmorgan-g @flutter/plugin
 /dev/devicelab/bin/tasks/entrypoint_dart_registrant.dart @aaclarke @flutter/plugin
 /dev/devicelab/bin/tasks/flavors_test_macos.dart @vashworth @flutter/desktop
 /dev/devicelab/bin/tasks/flutter_gallery_macos__compile.dart @cbracken @flutter/desktop
@@ -257,9 +257,9 @@
 /dev/devicelab/bin/tasks/flutter_view_macos__start_up.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/flutter_view_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
 /dev/devicelab/bin/tasks/gradle_desugar_classes_test.dart @bkonyi @flutter/tool
-/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart @stuartmorgan @flutter/plugin
-/dev/devicelab/bin/tasks/gradle_plugin_fat_apk_test.dart @stuartmorgan @flutter/plugin
-/dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart @stuartmorgan @flutter/plugin
+/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart @stuartmorgan-g @flutter/plugin
+/dev/devicelab/bin/tasks/gradle_plugin_fat_apk_test.dart @stuartmorgan-g @flutter/plugin
+/dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart @stuartmorgan-g @flutter/plugin
 /dev/devicelab/bin/tasks/hello_world_macos__compile.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/hello_world_win_desktop__compile.dart @yaakovschectman @flutter/desktop
 /dev/devicelab/bin/tasks/hot_mode_dev_cycle_ios_simulator.dart @louisehsu @flutter/tool
@@ -278,10 +278,10 @@
 /dev/devicelab/bin/tasks/platform_channel_sample_test_windows.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/platform_view_macos__start_up.dart @cbracken @flutter/desktop
 /dev/devicelab/bin/tasks/platform_view_win_desktop__start_up.dart @yaakovschectman @flutter/desktop
-/dev/devicelab/bin/tasks/plugin_lint_mac.dart @stuartmorgan @flutter/plugin
-/dev/devicelab/bin/tasks/plugin_test.dart @stuartmorgan @flutter/plugin
-/dev/devicelab/bin/tasks/plugin_test_ios.dart @stuartmorgan @flutter/ios
-/dev/devicelab/bin/tasks/plugin_test_linux.dart @stuartmorgan @flutter/desktop
+/dev/devicelab/bin/tasks/plugin_lint_mac.dart @stuartmorgan-g @flutter/plugin
+/dev/devicelab/bin/tasks/plugin_test.dart @stuartmorgan-g @flutter/plugin
+/dev/devicelab/bin/tasks/plugin_test_ios.dart @stuartmorgan-g @flutter/ios
+/dev/devicelab/bin/tasks/plugin_test_linux.dart @stuartmorgan-g @flutter/desktop
 /dev/devicelab/bin/tasks/plugin_test_macos.dart @vashworth @flutter/desktop
 /dev/devicelab/bin/tasks/plugin_test_windows.dart @loic-sharma @flutter/desktop
 /dev/devicelab/bin/tasks/run_debug_test_android.dart @bkonyi @flutter/tool
@@ -336,7 +336,7 @@
 # docs @Piinks @flutter/framework
 # flutter_driver_android_test @matanlurey @jonahwilliams
 # flutter_packaging @christopherfujino @flutter/infra
-# flutter_plugins @stuartmorgan @flutter/plugin
+# flutter_plugins @stuartmorgan-g @flutter/plugin
 # framework_tests @Piinks @flutter/framework
 # fuchsia_precache @bkonyi @flutter/tool
 # realm_checker @eyebrowsoffire @flutter/tool