diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index efcbb87936a41..1af09cf876e3e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -20,19 +20,9 @@ sycl/ @intel/llvm-reviewers-runtime
 
 # Documentation
 sycl/ReleaseNotes.md @pvchupin
-sycl/doc/ @pvchupin @kbobrovs
+sycl/doc/ @pvchupin @bader
 sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
 
-# USM
-sycl/include/CL/sycl/detail/clusm.hpp @jbrodman
-sycl/include/CL/sycl/detail/usm_impl.hpp @jbrodman
-sycl/include/CL/sycl/usm/ @jbrodman
-sycl/include/CL/sycl/ordered_queue.hpp @jbrodman
-sycl/include/CL/sycl/usm.hpp @jbrodman
-sycl/include/CL/cl_usm_ext.h @jbrodman
-sycl/source/detail/usm/ @jbrodman
-sycl/source/ordered_queue.cpp @jbrodman
-
 # Sub-groups
 sycl/include/CL/sycl/detail/spirv.hpp @Pennycook @AlexeySachkov
 sycl/include/CL/sycl/intel/group_algorithm.hpp @Pennycook @AlexeySachkov
@@ -59,15 +49,6 @@ sycl/include/CL/sycl/stream.hpp @againull
 sycl/source/detail/stream_impl.cpp @againull
 sycl/source/stream.cpp @againull
 
-# Specialization constant
-sycl/include/CL/sycl/detail/sycl_fe_intrins.hpp @kbobrovs
-sycl/include/CL/sycl/experimental/spec_constant.hpp @kbobrovs
-sycl/source/detail/spec_constant_impl.hpp @kbobrovs
-
-# Program manager
-sycl/source/detail/program_manager @kbobrovs
-sycl/source/detail/spec_constant_impl.cpp @kbobrovs
-
 # FPGA extensions
 sycl/include/CL/sycl/intel/fpga_device_selector.hpp @MrSidims
 sycl/include/CL/sycl/intel/fpga_extensions.hpp @MrSidims
@@ -95,19 +76,19 @@ xpti/ @tovinkere @andykaylor
 xptifw/ @tovinkere  @andykaylor
 
 # DPC++ tools
-llvm/**/file-table-tform/ @kbobrovs @AlexeySachkov
+llvm/**/file-table-tform/ @mlychkov @AlexeySachkov
 llvm/**/llvm-foreach/ @AlexeySachkov  @Fznamznon
 llvm/**/llvm-no-spir-kernel/ @AGindinson @AlexeySachkov
-llvm/**/sycl-post-link/ @kbobrovs @AlexeySachkov
-llvm/include/llvm/Support/PropertySetIO.h @kbobrovs @AlexeySachkov
-llvm/lib/Support/PropertySetIO.cpp @kbobrovs @AlexeySachkov
-llvm/unittests/Support/PropertySetIOTest.cpp @kbobrovs @AlexeySachkov
-llvm/lib/Support/Base64.cpp @kbobrovs @AlexeySachkov
+llvm/**/sycl-post-link/ @mlychkov @AlexeySachkov
+llvm/include/llvm/Support/PropertySetIO.h @mlychkov @AlexeySachkov
+llvm/lib/Support/PropertySetIO.cpp @mlychkov @AlexeySachkov
+llvm/unittests/Support/PropertySetIOTest.cpp @mlychkov @AlexeySachkov
+llvm/lib/Support/Base64.cpp @mlychkov @AlexeySachkov
 
 # Clang offload tools
-clang/tools/clang-offload-bundler/ @kbobrovs @sndmitriev
-clang/tools/clang-offload-wrapper/ @sndmitriev @kbobrovs
-clang/tools/clang-offload-deps/ @sndmitriev
+clang/tools/clang-offload-bundler/ @mlychkov @sndmitriev @AlexeySachkov
+clang/tools/clang-offload-wrapper/ @mlychkov @sndmitriev @AlexeySachkov
+clang/tools/clang-offload-deps/ @sndmitriev @mlychkov @AlexeySachkov
 
 # Explicit SIMD
 SYCLLowerIR/ @kbobrovs @DenisBakhvalov
@@ -118,4 +99,3 @@ sycl/doc/extensions/ExplicitSIMD/ @kbobrovs
 # ITT annotations
 llvm/lib/Transforms/Instrumentation/SPIRITTAnnotations.cpp @MrSidims
 llvm/include/llvm/Transforms/Instrumentation/SPIRITTAnnotations.h @MrSidims
-