diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a44c7593cae6..d5c140e52d49 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -25,6 +25,9 @@
 /sdk/core/azure-core-tracing-opencensus/                             @pvaneck
 /sdk/core/azure-core-tracing-opentelemetry/                          @pvaneck
 
+# Smoke Tests
+/common/smoketest/                                                   @lmazuel @chlowell @annatisch @mccoyp @shurd @southpolesteve
+
 ####################
 # Client Libraries
 ####################
@@ -172,6 +175,9 @@
 # PRLabel: %Monitor
 /sdk/loganalytics/                                                   @pvaneck
 
+# PRLabel: %Monitor
+/sdk/monitor/                                                        @pvaneck
+
 # AzureSdkOwners: @pvaneck
 # ServiceLabel: %Monitor
 # PRLabel: %Monitor
@@ -183,9 +189,6 @@
 # PRLabel: %Monitor
 /sdk/monitor/azure-monitor-querymetrics/                             @Azure/azure-sdk-write-monitor-query-metrics
 
-# PRLabel: %Monitor
-/sdk/monitor/*                                                       @pvaneck
-
 # PRLabel: %Monitor - ApplicationInsights
 /sdk/applicationinsights/azure-applicationinsights/                  @azmonapplicationinsights @pvaneck
 
@@ -224,7 +227,13 @@
 # ServiceLabel: %Data Factory
 # PRLabel: %Data Factory
 /sdk/datafactory/                                                    @hvermis
+
+# ServiceLabel: %Data Factory
+# PRLabel: %Data Factory
 /sdk/datalake/                                                       @ro-joowan
+
+# ServiceLabel: %Data Migration
+# PRLabel: %Data Migration
 /sdk/datamigration/                                                  @vchske
 
 # PRLabel: %Device Provisioning
@@ -284,23 +293,47 @@
 
 # PRLabel: %ML-Jobs
 /sdk/ml/azure-ai-ml/azure/ai/ml/_schema/job*                         @TonyJ1 @kingernupur @achauhan-scc @jayesh-tanna @paulshealy1
+
+# PRLabel: %ML-Jobs
 /sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/                       @TonyJ1 @kingernupur @achauhan-scc @jayesh-tanna @paulshealy1
+
+# PRLabel: %ML-Jobs
 /sdk/ml/training-experiences.tests.yml                               @TonyJ1 @kingernupur @achauhan-scc @jayesh-tanna @paulshealy1
 
 # PRLabel: %ML-AutoML
 /sdk/ml/azure-ai-ml/azure/ai/ml/_schema/automl/                      @skasturi @rtanase @raduk @PhaniShekhar @sharma-riti @jialiu103 @nick863 @yuanzhuangyuanzhuang @novaturient95
+
+# PRLabel: %ML-AutoML
 /sdk/ml/azure-ai-ml/azure/ai/ml/_schema/pipeline/automl_node.py      @skasturi @rtanase @raduk @PhaniShekhar @sharma-riti @jialiu103 @nick863 @yuanzhuangyuanzhuang @novaturient95
+
+# PRLabel: %ML-AutoML
 /sdk/ml/azure-ai-ml/azure/ai/ml/automl/                              @skasturi @rtanase @raduk @PhaniShekhar @sharma-riti @jialiu103 @nick863 @yuanzhuangyuanzhuang @novaturient95
+
+# PRLabel: %ML-AutoML
 /sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/automl/                @skasturi @rtanase @raduk @PhaniShekhar @sharma-riti @jialiu103 @nick863 @yuanzhuangyuanzhuang @novaturient95
+
+# PRLabel: %ML-AutoML
 /sdk/ml/azure-ai-ml/tests/automl_job/                                @skasturi @rtanase @raduk @PhaniShekhar @sharma-riti @jialiu103 @nick863 @yuanzhuangyuanzhuang @novaturient95
+
+# PRLabel: %ML-AutoML
 /sdk/ml/azure-ai-ml/tests/test_configs/automl_job/                   @skasturi @rtanase @raduk @PhaniShekhar @sharma-riti @jialiu103 @nick863 @yuanzhuangyuanzhuang @novaturient95
+
+# PRLabel: %ML-AutoML
 /sdk/ml/automl.tests.yml                                             @skasturi @rtanase @raduk @PhaniShekhar @sharma-riti @jialiu103 @nick863 @yuanzhuangyuanzhuang @novaturient95
 
 # PRLabel: %ML-ImportJob
 /sdk/ml/azure-ai-ml/azure/ai/ml/_schema/job/import_job.py                     @vivram
+
+# PRLabel: %ML-ImportJob
 /sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/import_job.py                   @vivram
+
+# PRLabel: %ML-ImportJob
 /sdk/ml/azure-ai-ml/azure/ai/ml/_schema/pipeline/pipeline_import_job.py       @vivram
+
+# PRLabel: %ML-ImportJob
 /sdk/ml/azure-ai-ml/azure/ai/ml/entities/_builders/import_func.py             @vivram
+
+# PRLabel: %ML-ImportJob
 /sdk/ml/azure-ai-ml/azure/ai/ml/entities/_builders/import_node.py             @vivram
 
 # ServiceLabel: %Maps
@@ -310,6 +343,9 @@
 # ServiceLabel: %Mixed Reality
 # PRLabel: %Mixed Reality
 /sdk/mixedreality/azure-mixedreality-authentication/                 @RamonArguelles
+
+# ServiceLabel: %Mixed Reality
+# PRLabel: %Mixed Reality
 /sdk/remoterendering/                                                @FlorianBorn71
 
 # ServiceLabel: %Online Experimentation
@@ -457,9 +493,6 @@
 # PRLabel: %WebPubSub
 /sdk/webpubsub/                                                      @msyyc @iscai-msft
 
-# Smoke Tests
-/common/smoketest/                                                   @lmazuel @chlowell @annatisch @mccoyp @shurd @southpolesteve
-
 # ServiceLabel: %AAD %Service Attention
 # ServiceOwners:          @adamedx