diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b6e4acb64b12..3749fc04c352 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -430,7 +430,7 @@
 
 # ServiceLabel: %Event Grid
 # AzureSdkOwners:                                   @billwert
-# ServiceOwners:                                    @jfggdl
+# ServiceOwners:                                    @Kishp01 @ahamad-MS
 
 # PRLabel: %Event Hubs
 /sdk/eventhubs/                                      @conniey @anuchandy @lmolkova
@@ -647,9 +647,6 @@
 # ServiceLabel: %Redis Cache
 # ServiceOwners:                                     @yegu-ms
 
-# ServiceLabel: %Relay
-# ServiceOwners:                                     @jfggdl
-
 # PRLabel: %Remote Rendering
 /sdk/remoterendering/                                @MichaelZp0 @ChristopherManthei
 
diff --git a/.github/CODEOWNERS_baseline_errors.txt b/.github/CODEOWNERS_baseline_errors.txt
index f9dcb89049bb..faf15e0ee168 100644
--- a/.github/CODEOWNERS_baseline_errors.txt
+++ b/.github/CODEOWNERS_baseline_errors.txt
@@ -270,3 +270,5 @@ ccmshowbackdevs is an invalid user. Ensure the user exists, is public member of
 sagivf is not a public member of Azure.
 Aviv-Yaniv is not a public member of Azure.
 tmahmood-microsoft is not a public member of Azure.
+Kishp01 is not a public member of Azure.
+ahamad-MS is an invalid user. Ensure the user exists, is public member of Azure and has write permissions.
\ No newline at end of file