diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1ec18c8fc1..240df00b4f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -91,3 +91,9 @@
 /.github/CODEOWNERS      @rickwinter @ronniegeraghty @Azure/azure-sdk-eng
 
 /.config/1espt/          @benbp @weshaggard
+
+# Add Johnathan Walker as code owner for Event Hubs SDK
+/sdk/eventhubs/* @j7nw4r
+
+# Add Johnathan Walker as code owner for Service Bus SDK
+/sdk/servicebus/* @j7nw4r