diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7c3cc2c61e..81bb3284a2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,18 +1,9 @@
 # Global Owners
-* @vparfonov @nickboldt
-
-# dashboard
-dashboard/** @ashumilova @benoitf @nickboldt
+* @vparfonov @nickboldt @sparkoo
 
 # dockerfiles
 dockerfiles/** @benoitf @nickboldt
 
-# ide
-ide/che-core-ide-stacks/** @ashumilova @nickboldt
-
-# agents
-agents/** @tolusha @nickboldt
-
 # assembly
 assembly/** @skabashnyuk @nickboldt
 assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/** @sleshchenko @ibuziuk @nickboldt
@@ -32,17 +23,6 @@ multiuser/permission/**  @sleshchenko @nickboldt
 multiuser/personal-account/**  @sleshchenko @nickboldt
 multiuser/sql-schema/**  @mshaposhnik @sleshchenko @nickboldt
 
-# plugins
-plugins/plugin*debugger/** @tolusha @nickboldt
-plugins/plugin-gdb/** @tolusha @nickboldt
-plugins/plugin-docker/** @sleshchenko @nickboldt
-plugins/plugin-java/** @vparfonov @nickboldt
-plugins/plugin-languageserver/** @vparfonov @dkuleshov @nickboldt
-plugins/plugin-maven/** @vparfonov @nickboldt
-plugins/plugin-orion/** @azatsarynnyy @nickboldt
-plugins/plugin-testing*/** @vparfonov @nickboldt
-plugins/plugin-traefik/** @benoitf @nickboldt
-
 # wsmaster
 wsmaster/** @skabashnyuk @nickboldt
 wsmaster/che-core-api-factory/** @mshaposhnik @nickboldt
@@ -50,17 +30,6 @@ wsmaster/che-core-api-factory-shared/**   @mshaposhnik @nickboldt
 wsmaster/che-core-api-workspace-activity/**   @mshaposhnik @nickboldt
 wsmaster/che-core-api-workspace/**  @sleshchenko @mshaposhnik @metlos @nickboldt
 
-# wsagent
-wsagent/activity/** @skabashnyuk @nickboldt
-wsagent/agent/** @tolusha @nickboldt
-wsagent/che-core-api-debug*/** @tolusha @nickboldt
-wsagent/che-core-api-languageserver*/** @vparfonov @dkuleshov @nickboldt
-wsagent/che-core-api-testing*/** @vparfonov @nickboldt
-wsagent/che-wsagent-core/** @skabashnyuk @nickboldt
-wsagent/wsagent-local/** @skabashnyuk @nickboldt
-wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/search/server/** @skabashnyuk @nickboldt
-wsagent/che-core-api-project/src/test/java/org/eclipse/che/api/search/** @skabashnyuk @nickboldt
-
 # deploy
 deploy/** @sleshchenko @nickboldt
 deploy/openshift/templates/monitoring/** @skabashnyuk @metlos @nickboldt