diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bddc4d68df..c94d3ace69 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,13 +1,4 @@
-* @aws/aws-ides-team
+* @aws/amazon-q-ide-extensions-all
 
-chat/ @aws/codewhisperer-team
 codemodernizer/ @aws/elastic-gumby
 codetransform/ @aws/elastic-gumby
-codewhisperer/ @aws/codewhisperer-team
-
-mynah-ui/ @aws/flare
-mynah-ui/package.json @aws/flare @aws/elastic-gumby @aws/earlybird @aws/codewhisperer-team
-mynah-ui/package-lock.json @aws/flare @aws/elastic-gumby @aws/earlybird @aws/codewhisperer-team
-
-# nested within chat/, so needs to be after to take precedence
-amazonqFeatureDev/ @aws/earlybird