diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 531f92c11ad38..fe1cd6fc2743b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,25 +13,6 @@
 # /doc/
 # /samples/
 
-###########
-# Eng Sys
-###########
-/eng/                                                @hallipr @weshaggard @benbp @JimSuplizio
-/eng/code-quality-reports/                           @mssfang @JonathanGiles
-/eng/jacoco-test-coverage/                           @srnagar @JonathanGiles
-/eng/spotbugs-aggregate-report/                      @srnagar @JonathanGiles
-/eng/mgmt/                                           @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978 @hallipr @weshaggard @benbp @JimSuplizio
-/eng/versioning/                                     @alzimmermsft @samvaity @g2vinay @JimSuplizio
-/eng/versioning/external_dependencies.txt            @alzimmermsft @samvaity @g2vinay @jonathangiles @backwind1233 @chenrujun @hui1110 @netyyyy @saragluna @stliu @yiliuTo @moarychan @fangjian0423
-/eng/bomgenerator/                                   @vcolin7 @alzimmermsft @srnagar @jonathangiles
-/parent/                                             @alzimmermsft
-
-/**/tests.yml                                        @hallipr @JimSuplizio
-/**/ci.yml                                           @hallipr @JimSuplizio
-
-# Add owners for notifications for specific pipelines
-/eng/pipelines/aggregate-reports.yml                 @joshfree @jonathangiles
-
 ################
 # Automation
 ################
@@ -175,10 +156,10 @@
 /sdk/monitor/azure-monitor-opentelemetry-exporter/   @trask @ramthi @heyams @jeanbisutti
 
 # PRLabel:  %Monitor
-/sdk/monitor/azure-monitor-query*/                  @srnagar @lmolkova @ki1729
+/sdk/monitor/azure-monitor-query*/                   @srnagar @lmolkova @ki1729
 
 # PRLabel:  %Monitor
-/sdk/monitor/azure-monitor-ingestion*/              @srnagar @lmolkova @ki1729
+/sdk/monitor/azure-monitor-ingestion*/               @srnagar @lmolkova @ki1729
 
 # PRLabel: %Mixed Reality Authentication
 /sdk/mixedreality/azure-mixedreality-authentication/ @craigktreasure
@@ -784,3 +765,19 @@
 
 # ServiceLabel: %DevCenter %Service Attention
 #/<NotInRepo>/          @sebrenna @mharlan
+
+###########
+# Eng Sys
+###########
+/eng/                                                @hallipr @weshaggard @benbp @JimSuplizio
+/eng/code-quality-reports/                           @mssfang @JonathanGiles
+/eng/jacoco-test-coverage/                           @srnagar @JonathanGiles
+/eng/spotbugs-aggregate-report/                      @srnagar @JonathanGiles
+/eng/mgmt/                                           @weidongxu-microsoft @haolingdong-msft @XiaofeiCao @arthurma1978 @hallipr @weshaggard @benbp @JimSuplizio
+/eng/versioning/                                     @alzimmermsft @samvaity @g2vinay @JimSuplizio
+/eng/versioning/external_dependencies.txt            @alzimmermsft @samvaity @g2vinay @jonathangiles @backwind1233 @chenrujun @hui1110 @netyyyy @saragluna @stliu @yiliuTo @moarychan @fangjian0423
+/eng/bomgenerator/                                   @vcolin7 @alzimmermsft @srnagar @jonathangiles
+/parent/                                             @alzimmermsft
+
+# Add owners for notifications for specific pipelines
+/eng/pipelines/aggregate-reports.yml                 @joshfree @jonathangiles