diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 398fbcf9e6..28dd0cee1e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -26,12 +26,12 @@ infrastructures/** @garagatyi
 # plugins
 plugins/plugin*debugger/** @tolusha
 plugins/plugin-gdb/** @tolusha
-plugins/plugin-docker/** @garagatyi
-plugins/plugin-java/** @evidolob
-plugins/plugin-languageserver/** @evidolob @dkuleshov
-plugins/plugin-maven/** @evidolob
+plugins/plugin-docker/** @garagatyi @sleshchenko
+plugins/plugin-java/** @vparfonov
+plugins/plugin-languageserver/** @vparfonov @dkuleshov
+plugins/plugin-maven/** @vparfonov
 plugins/plugin-orion/** @azatsarynnyy
-plugins/plugin-testing*/** @evidolob
+plugins/plugin-testing*/** @vparfonov
 plugins/plugin-traefik/** @benoitf
 
 # wsmaster
@@ -42,8 +42,8 @@ wsmaster/che-core-api-workspace*/** @garagatyi
 wsagent/activity/** @skabashnyuk
 wsagent/agent/** @tolusha
 wsagent/che-core-api-debug*/** @tolusha
-wsagent/che-core-api-languageserver*/** @evidolob @dkuleshov
-wsagent/che-core-api-testing*/** @evidolob
+wsagent/che-core-api-languageserver*/** @vparfonov @dkuleshov
+wsagent/che-core-api-testing*/** @vparfonov
 wsagent/che-wsagent-core/** @skabashnyuk
 wsagent/wsagent-local/** @skabashnyuk
 wsagent/che-core-api-project/src/main/java/org/eclipse/che/api/search/server/** @skabashnyuk