diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..a66514e6
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+.github/workflows/  @Significant-Gravitas/maintainers
+autogpts/autogpt/   @Pwuts
+benchmark/  @Significant-Gravitas/benchmarkers
+forge/      @Swiftyos
+frontend/   @hunterarahujo
diff --git a/autogpts/autogpt/.github/CODEOWNERS b/autogpts/autogpt/.github/CODEOWNERS
deleted file mode 100644
index d4c5c191..00000000
--- a/autogpts/autogpt/.github/CODEOWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-.github/workflows/ @Significant-Gravitas/maintainers
-autogpt/core @collijk