diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 110493c3..d586fc2c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
-.github/workflows/  @Significant-Gravitas/maintainers
-autogpts/autogpt/   @Pwuts
-benchmark/  @Significant-Gravitas/benchmarkers
-forge/      @Swiftyos
-frontend/   @hunteraraujo
+.github/workflows/  @Significant-Gravitas/devops
+autogpts/autogpt/   @Significant-Gravitas/maintainers
+autogpts/forge/     @Significant-Gravitas/forge-maintainers
+benchmark/          @Significant-Gravitas/benchmark-maintainers
+frontend/           @Significant-Gravitas/frontend-maintainers