diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bcf8b12fb6..7757ff8bce 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,15 +12,15 @@ assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/** @sleshchen
 core/** @skabashnyuk @nickboldt
 
 # workspace runtime infrastructure implementations
-infrastructures/** @sleshchenko @amisevsk @metlos @nickboldt
+infrastructures/** @skabashnyuk @amisevsk @metlos @nickboldt @sleshchenko
 
 # multiuser che
-multiuser/api/**  @sleshchenko @nickboldt
-multiuser/integration-tests/**  @mshaposhnik @sleshchenko @nickboldt
+multiuser/api/**  @skabashnyuk @nickboldt
+multiuser/integration-tests/**  @mshaposhnik @skabashnyuk @nickboldt
 multiuser/keycloak/**  @mshaposhnik @nickboldt
 multiuser/machine-auth/**  @mshaposhnik @nickboldt
-multiuser/permission/**  @sleshchenko @nickboldt
-multiuser/personal-account/**  @sleshchenko @nickboldt
+multiuser/permission/**  @skabashnyuk @nickboldt
+multiuser/personal-account/**  @skabashnyuk @nickboldt
 multiuser/sql-schema/**  @mshaposhnik @sleshchenko @nickboldt
 
 # wsmaster
@@ -28,10 +28,10 @@ wsmaster/** @skabashnyuk @nickboldt
 wsmaster/che-core-api-factory/** @mshaposhnik @nickboldt
 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
+wsmaster/che-core-api-workspace/**  @skabashnyuk @mshaposhnik @metlos @nickboldt @sleshchenko
 
 # deploy
-deploy/** @sleshchenko @nickboldt
+deploy/** @tolusha @nickboldt
 deploy/openshift/templates/monitoring/** @skabashnyuk @metlos @nickboldt
 
 # selenium tests