diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dc7dc89e90d7..c37dffe6cd93 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -870,3 +870,9 @@
 
 /pylintrc                                                            @l0lawrence @scbedd @mccoyp
 /sdk/**/ci.yml                                                       @msyyc @lmazuel @scbedd
+
+# Add Johnathan Walker as code owner for Event Hubs SDK
+/sdk/eventhub/azure-eventhub/* @j7nw4r
+
+# Add Johnathan Walker as code owner for Service Bus SDK
+/sdk/servicebus/azure-servicebus/* @j7nw4r