diff --git a/CODEOWNERS b/CODEOWNERS
index c7642128..f1641739 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1,3 @@
-.*   @TrueCloudLab/storage-core @TrueCloudLab/storage-services
+.*          @TrueCloudLab/storage-core-committers @TrueCloudLab/storage-core-developers @TrueCloudLab/storage-services-committers @TrueCloudLab/storage-services-developers
+.forgejo/.* @potyarkin
+Makefile    @potyarkin