diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9271600ba3..324fb2d364 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,7 +1,46 @@
-ldm/invoke/pngwriter.py @CapableWeb
-ldm/invoke/server_legacy.py @CapableWeb
-scripts/legacy_api.py @CapableWeb
-tests/legacy_tests.sh @CapableWeb
-installer/ @ebr
-.github/workflows/ @mauwii
-docker/ @mauwii
+# continuous integration
+/.github/workflows/ @mauwii
+
+# installation and configuration
+/docs/ @lstein @mauwii
+/docker/ @mauwii
+/scripts/ @ebr @lstein 
+/installer/ @ebr @lstein
+ldm/invoke/config @lstein @ebr
+invokeai/assets @lstein @ebr
+invokeai/configs @lstein @ebr
+/ldm/invoke/_version.py @lstein @blessedcoolant
+
+# web ui
+/invokeai/frontend @blessedcoolant @psychedelicious
+/invokeai/backend @blessedcoolant @psychedelicious
+
+# generation and model management
+/ldm/*.py @lstein
+/ldm/generate.py @lstein @keturn
+/ldm/invoke/args.py @lstein @blessedcoolant
+/ldm/invoke/ckpt* @lstein
+/ldm/invoke/ckpt_generator @lstein
+/ldm/invoke/CLI.py @lstein
+/ldm/invoke/config @lstein @ebr @mauwii
+/ldm/invoke/generator @keturn @damian0815
+/ldm/invoke/globals.py @lstein @blessedcoolant
+/ldm/invoke/merge_diffusers.py @lstein
+/ldm/invoke/model_manager.py @lstein @blessedcoolant
+/ldm/invoke/txt2mask.py @lstein
+/ldm/invoke/patchmatch.py @Kyle0654
+/ldm/invoke/restoration @lstein @blessedcoolant
+
+# attention, textual inversion, model configuration
+/ldm/models @damian0815 @keturn
+/ldm/modules @damian0815 @keturn
+
+# Nodes
+apps/ @Kyle0654
+
+# legacy REST API
+# is CapableWeb still engaged?
+/ldm/invoke/pngwriter.py @CapableWeb
+/ldm/invoke/server_legacy.py @CapableWeb
+/scripts/legacy_api.py @CapableWeb
+/tests/legacy_tests.sh @CapableWeb