diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 78ed19747ec..8a945ce2b82 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -13,24 +13,24 @@
 
 # The following paths involve server-side use cases, token/user session management.
 # Changes made to these paths requires additional reviews and approvals.
-/packages/auth @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/aws-amplify/src/adapter-core @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/adapterCore @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/singleton @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/convert @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/WordArray.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/storage @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/generateRandomString.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/globalHelpers @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/utils/urlSafeDecode.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/awsClients/cognitoIdentity @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/clients/internal @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/core/src/Hub @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/adapter-nextjs @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/rtn-web-browser @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/storage/src/providers/s3/apis/internal @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/storage/src/providers/s3/apis/server @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-rest/src/apis/server.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-rest/src/apis/common/internalPost.ts @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-graphql/src/server @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
-/packages/api-graphql/src/internals/server @ukhan-amazon @haverchuck @cshfang @jimblanc @HuiSF
+/packages/auth @haverchuck @cshfang @jimblanc @HuiSF
+/packages/aws-amplify/src/adapter-core @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/adapterCore @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/singleton @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/convert @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/WordArray.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/storage @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/generateRandomString.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/globalHelpers @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/utils/urlSafeDecode.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/awsClients/cognitoIdentity @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/clients/internal @haverchuck @cshfang @jimblanc @HuiSF
+/packages/core/src/Hub @haverchuck @cshfang @jimblanc @HuiSF
+/packages/adapter-nextjs @haverchuck @cshfang @jimblanc @HuiSF
+/packages/rtn-web-browser @haverchuck @cshfang @jimblanc @HuiSF
+/packages/storage/src/providers/s3/apis/internal @haverchuck @cshfang @jimblanc @HuiSF
+/packages/storage/src/providers/s3/apis/server @haverchuck @cshfang @jimblanc @HuiSF
+/packages/api-rest/src/apis/server.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/api-rest/src/apis/common/internalPost.ts @haverchuck @cshfang @jimblanc @HuiSF
+/packages/api-graphql/src/server @haverchuck @cshfang @jimblanc @HuiSF
+/packages/api-graphql/src/internals/server @haverchuck @cshfang @jimblanc @HuiSF