diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b3be68dd5..b10f657ca 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,11 @@
-* @artemrys
-/splunk_add_on_ucc_framework/schema/schema.json @artemrys @vtsvetkov-splunk
-/ui/ @vtsvetkov-splunk
+*                                                   @splunk/ucc-developers
+
+/ui/                                                @splunk/ucc-ui-developers
+*.ts                                                @splunk/ucc-ui-developers
+*.tsx                                               @splunk/ucc-ui-developers
+
+*.py                                                @splunk/ucc-be-developers
+/tests                                              @splunk/ucc-be-developers
+/splunk_add_on_ucc_framework                        @splunk/ucc-be-developers
+
+/splunk_add_on_ucc_framework/schema/schema.json     @splunk/ucc-developers