diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 142222e5595..7f12551debb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,8 +1,10 @@
-/docs @mlabieniec
-/packages/aws-amplify-angular/ @haverchuck
-/packages/aws-amplify/src/Auth/ @powerful23 @haverchuck
-/packages/aws-amplify/src/Analytics/ @powerful23
-/packages/aws-amplify/src/PubSub/ @manueliglesias @elorzafe
-/packages/amazon-cognito-identity-js/ @yuntuowang
-/.github/ @mlabieniec
-/.circleci/ @manueliglesias
+/packages/auth @elorzafe
+/packages/analytics @iartemiev
+/packages/pubsub @manueliglesias
+/packages/xr @jordanranz
+/packages/amplify-ui @jordanranz
+/packages/aws-amplify-react-native @Ashish-Nanda
+/packages/pushnotification @Ashish-Nanda
+/packages/datastore @manueliglesias
+/.github/ @sammartinez
+/.circleci/ @iartemiev