diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 21ed74e6c4b2..3906ed44f4b2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -334,8 +334,10 @@
 # PRLabel: %Schema Registry
 /sdk/schemaregistry/                                                 @kashifkhan @swathipil
 
-# AzureSdkOwners: @xiangyan99
 # ServiceLabel: %Search
+# AzureSdkOwners: @xiangyan99
+# ServiceOwners:  @mattgotteiner
+
 # PRLabel: %Search
 /sdk/search/                                                         @xiangyan99
 
@@ -830,9 +832,6 @@
 # ServiceLabel: %Scheduler %Service Attention
 #/<NotInRepo>/          @derek1ee
 
-# ServiceLabel: %Search %Service Attention
-#/<NotInRepo>/          @bleroy @tjacobhi @markheff @miwelsh
-
 # ServiceLabel: %Security %Service Attention
 #/<NotInRepo>/          @chlahav
 
@@ -911,9 +910,6 @@
 # ServiceLabel: %Network - Bastion %Service Attention
 #/<NotInRepo>/          @bastionsuppgithub
 
-# ServiceLabel: %Azure.Spring - Cosmos
-#/<NotInRepo>/          @kushagraThapar
-
 # ServiceLabel: %Network - Private Link %Service Attention
 #/<NotInRepo>/          @privlinksuppgithub