diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 33679c3ef..f3bf159c5 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -16,7 +16,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 # Global (will be requested for review if no more specific match)
-* @endlessm/games
+* @endlessm/threadbare-maintainers
 
 # Learning-related resources; anything that directly affects the learning
 # journey, especially related to documentation that the learning team would need
@@ -27,20 +27,20 @@ docs/pull_request_template.md    @endlessm/learning
 .github/PULL_REQUEST_TEMPLATE/   @endlessm/learning
 
 # Template maintainers
-scenes/quests/template_quests/       @endlessm/games @endlessm/learning
+scenes/quests/template_quests/                  @endlessm/threadbare-maintainers @endlessm/learning
 
 # Mythical Meadows
-scenes/quests/lore_quests/quest_004             @endlessm/games @endlessm/mythical-meadows
+scenes/quests/lore_quests/quest_004             @endlessm/threadbare-maintainers @endlessm/mythical-meadows
 
 # StoryQuest maintainers
-scenes/quests/story_quests/stella               @endlessm/games @endlessm/learning
+scenes/quests/story_quests/stella               @endlessm/threadbare-maintainers @endlessm/learning
 
-scenes/quests/story_quests/after_the_tremor     @endlessm/games @endlessm/after-the-tremor
-scenes/quests/story_quests/champ                @endlessm/games @endlessm/verso
-scenes/quests/story_quests/el_abrigo            @endlessm/games @endlessm/el-abrigo
-scenes/quests/story_quests/el_juguete_perdido   @endlessm/games @endlessm/el-juguete-perdido
-scenes/quests/story_quests/el_ojo_revelador     @endlessm/games @endlessm/el-ojo-revelador
-scenes/quests/story_quests/eldrune              @endlessm/games @endlessm/eldrune
-scenes/quests/story_quests/renya_beyond_sorrow  @endlessm/games @endlessm/renya-beyond-sorrow
-scenes/quests/story_quests/shjourney            @endlessm/games @endlessm/suenos-nocturnos
-scenes/quests/story_quests/verso                @endlessm/games @endlessm/verso
+scenes/quests/story_quests/after_the_tremor     @endlessm/threadbare-maintainers @endlessm/after-the-tremor
+scenes/quests/story_quests/champ                @endlessm/threadbare-maintainers @endlessm/verso
+scenes/quests/story_quests/el_abrigo            @endlessm/threadbare-maintainers @endlessm/el-abrigo
+scenes/quests/story_quests/el_juguete_perdido   @endlessm/threadbare-maintainers @endlessm/el-juguete-perdido
+scenes/quests/story_quests/el_ojo_revelador     @endlessm/threadbare-maintainers @endlessm/el-ojo-revelador
+scenes/quests/story_quests/eldrune              @endlessm/threadbare-maintainers @endlessm/eldrune
+scenes/quests/story_quests/renya_beyond_sorrow  @endlessm/threadbare-maintainers @endlessm/renya-beyond-sorrow
+scenes/quests/story_quests/shjourney            @endlessm/threadbare-maintainers @endlessm/suenos-nocturnos
+scenes/quests/story_quests/verso                @endlessm/threadbare-maintainers @endlessm/verso