diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index faffd8b8cc..f59803aab6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -31,6 +31,11 @@
 # PRLabel: %Attestation
 /sdk/attestation/        @gkostal @anilba06 @ahmadmsft @LarryOsterman @rickwinter
 
+# AzureSDKOwners: @LarryOsterman
+# ServiceLabel: %Event Hubs
+# PRLabel: %Event Hubs
+/sdk/eventhubs/           @LarryOsterman @antkmsft @ahsonkhan @gearama @RickWinter
+
 # AzureSDKOwners: @gearama
 # ServiceLabel:  %KeyVault
 # PRLabel: %KeyVault
@@ -41,6 +46,11 @@
 # PRLabel: %Storage
 /sdk/storage/            @vinjiang @Jinming-Hu @EmmaZhu @antkmsft @gearama @LarryOsterman @microzchang
 
+# AzureSDKOwners: @gearama
+# ServiceLabel: %Tables
+# PRLabel: %Tables
+/sdk/tables/            @gearama @LarryOsterman @antkmsft @ahsonkhan
+
 # AzureSDKOwners: @danieljurek
 # PRLabel: %EngSys
 /sdk/template/           @danieljurek @weshaggard @LarryOsterman @RickWinter