diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 98993dc847..359a94fa81 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,10 +1,10 @@
 * @aws/aws-ides-team
 
-amazonq/ @aws/aws-mynah
+amazonq/ @aws/dexp @aws/aws-mynah
 amazonqFeatureDev/ @aws/earlybird
 
 codemodernizer/ @aws/elastic-gumby
 codetransform/ @aws/elastic-gumby
 codewhisperer/ @aws/codewhisperer-team
 
-mynah-ui/ @aws/aws-mynah
+mynah-ui/ @aws/dexp @aws/aws-mynah