diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index db526f2abede..7242c9017b34 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -855,7 +855,7 @@
 /sdk/**/ci.yml                                                       @msyyc @lmazuel @scbedd @danieljurek
 
 # Add Johnathan Walker as code owner for Event Hubs SDK
-/sdk/eventhub/azure-eventhub/* @j7nw4r
+/sdk/eventhub/azure-eventhub/* @j7nw4r @SwayGom
 
 # Add Johnathan Walker as code owner for Service Bus SDK
-/sdk/servicebus/azure-servicebus/* @j7nw4r
+/sdk/servicebus/azure-servicebus/* @j7nw4r @SwayGom