diff --git a/CODEOWNERS b/CODEOWNERS
index 7c7c3e19e..31f5cc836 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1,22 @@
-*       @comfyanonymous
+# Admins
+* @comfyanonymous
+
+# Maintainers
+*.md @Comfy-Org/comfy_maintainers
+/tests/ @Comfy-Org/comfy_maintainers
+/tests-unit/ @Comfy-Org/comfy_maintainers
+/notebooks/ @Comfy-Org/comfy_maintainers
+/script_examples/ @Comfy-Org/comfy_maintainers
+
+# Execution engine
+/execution.py @Comfy-Org/comfy_execution_devs
+/comfy_execution/ @Comfy-Org/comfy_execution_devs
+
+# Web server
+/server.py @Comfy-Org/comfy_web_server_devs
+/folder_paths.py @Comfy-Org/comfy_web_server_devs
+/api_server/ @Comfy-Org/comfy_web_server_devs
+/app/ @Comfy-Org/comfy_web_server_devs
+
+# Extra nodes
+/comfy_extras/ @Comfy-Org/comfy_extra_nodes_devs
\ No newline at end of file