diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d86856ac34b1..9a05ed6a3cb0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,13 @@
+/ydb/core/fq/ @ydb-platform/fq
+/ydb/core/public_http/ @ydb-platform/fq
+
 /ydb/docs/ @ydb-platform/docs
+
 /ydb/library/yql/ @ydb-platform/yql
+/ydb/library/yql/providers/generic @ydb-platform/fq
+/ydb/library/yql/providers/pq @ydb-platform/fq
+/ydb/library/yql/providers/s3 @ydb-platform/fq
+/ydb/library/yql/providers/solomon @ydb-platform/fq
+
+/ydb/services/fq/ @ydb-platform/fq
+