diff --git a/CODEOWNERS b/CODEOWNERS
index bb13116..2f44ab8 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1,5 @@
-.*   @fyrchik
+.forgejo/.*           @potyarkin
+Makefile              @potyarkin
+frostfsid/client/.*   @dkirillov
+.*                    @TrueCloudLab/storage-core-developers @TrueCloudLab/storage-core-committers @TrueCloudLab/storage-service-developers @TrueCloudLab/storage-service-committers
+tests/.*              @fyrchik