diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6bb9cdd4ab4f..8b3762debe81 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -787,10 +787,10 @@
 # ServiceOwners:                                                   @skarri-microsoft @EldertGrootenboer
 
 # PRLabel: %Service Bus
-/sdk/servicebus/                                                   @skarri-microsoft @EldertGrootenboer @Azure/azure-java-sdk
+/sdk/servicebus/                                                   @skarri-microsoft @EldertGrootenboer @j7nw4r @Azure/azure-java-sdk
 
 # PRLabel: %Service Bus %Track 1
-/sdk/servicebus/microsoft-azure-servicebus/                        @skarri-microsoft @EldertGrootenboer @Azure/azure-java-sdk
+/sdk/servicebus/microsoft-azure-servicebus/                        @skarri-microsoft @EldertGrootenboer @j7nw4r @Azure/azure-java-sdk
 
 # ServiceLabel: %Service Bus %Track 1
 # AzureSdkOwners:                                                  @skarri-microsoft @EldertGrootenboer
@@ -994,3 +994,6 @@
 
 # Add Cosmos source owners as the owners of their specialized matrix
 /eng/pipelines/templates/stages/cosmos-emulator-matrix.json        @kirankumarkolli @Azure/azure-cosmos-java-sdk-connectors
+
+# Add Johnathan Walker as code owner for Event Hubs SDK
+/sdk/messaging/azure-messaging-eventhubs/* @j7nw4r