diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e065a6337ec8..0072b56570e0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -15,14 +15,26 @@
 # PRLabel: %Azure.Core
 /sdk/core/core-amqp/ @ramya-rao-a @chradek @richardpark-msft @HarshaNalluru
 
+# PRLabel: %Azure.Core
+/sdk/core/core-asynciterator-polyfill/ @xirzec @bterlson @chradek @jeremymeng
+
 # PRLabel: %Azure.Core
 /sdk/core/core-auth/ @daviwil @xirzec @bterlson
 
+# PRLabel: %Azure.Core
+/sdk/core/core-client/ @xirzec @bterlson @chradek @jeremymeng
+
+# PRLabel: %Azure.Core
+/sdk/core/core-crypto/ @xirzec @bterlson @chradek @jeremymeng
+
 # PRLabel: %Azure.Core
 /sdk/core/core-http/ @daviwil @xirzec @bterlson @chradek @jeremymeng
 
 # PRLabel: %Azure.Core
-/sdk/core/core-lro/ @sadasant @xirzec @bterlson
+/sdk/core/core-https/ @xirzec @bterlson @chradek @jeremymeng
+
+# PRLabel: %Azure.Core
+/sdk/core/core-lro/ @sadasant @xirzec @bterlson @chradek @jeremymeng
 
 # PRLabel: %Azure.Core
 /sdk/core/core-paging/ @daviwil @xirzec @bterlson
@@ -30,6 +42,9 @@
 # PRLabel: %Azure.Core
 /sdk/core/core-tracing/ @xirzec @bterlson @chradek @richardpark-msft
 
+# PRLabel: %Azure.Core
+/sdk/core/core-xml/ @xirzec @bterlson @chradek @jeremymeng
+
 # PRLabel: %Azure.Core
 /sdk/core/logger @xirzec @bterlson @chradek