diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a054b6e054a9d..c436bd89d3e2b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,116 +1,55 @@
 * @bader
 
 # Front-end compiler
-clang/ @premanandrao @elizabethandrews @smanna12
+clang/ @intel/dpcpp-cfe-reviewers
 
-# Driver
-clang/**/Driver @mdtoguchi @AGindinson @hchilama
+# Clang driver
+clang/**/Driver @intel/dpcpp-clang-driver-reviewers
 
 # LLVM-SPIRV translator
-llvm-spirv/ @AlexeySotkin @AlexeySachkov
+llvm-spirv/ @intel/dpcpp-spirv-reviewers
 
 # OpenCL deps
-opencl/ @pvchupin @vladimirlaz
+opencl/ @intel/llvm-reviewers-runtime
 
 # OpenCL "offline" compiler
-opencl/opencl-aot/ @dm-vodopyanov @AlexeySachkov @romanovvlad
+opencl/opencl-aot/ @intel/dpcpp-tools-reviewers
 
 # Device library
-libdevice/ @vzakhari @jinge90
+libdevice/ @intel/llvm-reviewers-runtime
 
 # DPC++ runtime library
 sycl/ @intel/llvm-reviewers-runtime
 
 # Documentation
-sycl/ReleaseNotes.md @pvchupin @tfzhu
-sycl/doc/ @pvchupin @bader
+sycl/ReleaseNotes.md @intel/dpcpp-doc-reviewers
+sycl/doc/ @intel/dpcpp-doc-reviewers
+sycl/doc/design/ @intel/dpcpp-specification-reviewers
 sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
-sycl/doc/extensions/SPIRV/ @AlexeySotkin @bashbaug @mbelicki
+sycl/doc/extensions/SPIRV/ @intel/dpcpp-spirv-doc-reviewers
 sycl/doc/dev @bader @vladimirlaz
 
-# Sub-groups
-sycl/include/CL/sycl/detail/spirv.hpp @Pennycook @AlexeySachkov
-sycl/include/sycl/ext/intel/group_algorithm.hpp @Pennycook @AlexeySachkov
-sycl/include/sycl/ext/intel/sub_group.hpp @Pennycook @AlexeySachkov
-sycl/include/sycl/ext/intel/sub_group_host.hpp @Pennycook @AlexeySachkov
-
-# PI API
-sycl/include/CL/sycl/detail/pi.def @smaslov-intel
-sycl/include/CL/sycl/detail/pi.h   @smaslov-intel
-sycl/include/CL/sycl/detail/pi.hpp @smaslov-intel
-sycl/include/CL/sycl/detail/pi* @smaslov-intel
-sycl/plugins/ @smaslov-intel
-sycl/source/detail/pi.cpp @smaslov-intel
-sycl/source/detail/plugin.hpp @smaslov-intel
-sycl/source/detail/posix_pi.cpp @smaslov-intel
-sycl/source/detail/windows_pi.cpp @smaslov-intel
+# Level Zero plugin
+sycl/sycl/plugins/level_zero @intel/dpcpp-l0-pi-reviewers
 
 # ESIMD CPU emulator plug-in
-sycl/plugins/esimd_cpu/ @kbobrovs @smaslov-intel
+sycl/plugins/esimd_cpu/ @intel/dpcpp-esimd-reviewers
 
 # CUDA plugin
 sycl/plugins/cuda/ @intel/llvm-reviewers-cuda
 
-# Stream
-sycl/include/CL/sycl/detail/stream_impl.hpp @againull
-sycl/include/CL/sycl/stream.hpp @againull
-sycl/source/detail/stream_impl.cpp @againull
-sycl/source/stream.cpp @againull
-
-# FPGA extensions
-sycl/include/sycl/ext/intel/fpga_device_selector.hpp @MrSidims
-sycl/include/sycl/ext/intel/fpga_extensions.hpp @MrSidims
-sycl/include/sycl/ext/intel/fpga_reg.hpp @MrSidims
-sycl/include/sycl/ext/intel/pipes.hpp @MrSidims
-sycl/include/CL/sycl/pipes.hpp @MrSidims
-
-# Reduction extension
-sycl/include/sycl/ext/intel/reduction.hpp @v-klochkov
-
-# Function pointers
-sycl/include/sycl/ext/intel/function_pointer.hpp @AlexeySachkov
-sycl/source/function_pointer.cpp @AlexeySachkov
-
-# Half Type
-sycl/include/CL/sycl/half_type.hpp @AlexeySachkov
-sycl/source/half_type.cpp @AlexeySachkov
-
 # XPTI instrumentation utilities
-xpti/ @tovinkere @andykaylor @alexbatashev
-xptifw/ @tovinkere @andykaylor @alexbatashev
+xpti/ @tovinkere @intel/llvm-reviewers-runtime
+xptifw/ @tovinkere @intel/llvm-reviewers-runtime
 
 # DPC++ tools
-llvm/**/append-file/ @mdtoguchi @AGindinson
-llvm/**/file-table-tform/ @mlychkov @AlexeySachkov @kbobrovs
-llvm/**/llvm-foreach/ @AlexeySachkov  @Fznamznon
-llvm/**/llvm-no-spir-kernel/ @AGindinson @AlexeySachkov
-llvm/**/sycl-post-link/ @mlychkov @AlexeySachkov @kbobrovs
-llvm/include/llvm/Support/PropertySetIO.h @mlychkov @AlexeySachkov @kbobrovs
-llvm/lib/Support/PropertySetIO.cpp @mlychkov @AlexeySachkov @kbobrovs
-llvm/unittests/Support/PropertySetIOTest.cpp @mlychkov @AlexeySachkov @kbobrovs
-llvm/include/llvm/Support/SimpleTable.h @mlychkov @AlexeySachkov @kbobrovs
-llvm/lib/Support/SimpleTable.cpp @mlychkov @AlexeySachkov @kbobrovs
-llvm/unittests/Support/SimpleTableTest.cpp @mlychkov @AlexeySachkov @kbobrovs
-llvm/lib/Support/Base64.cpp @mlychkov @AlexeySachkov @kbobrovs
+llvm/ @intel/dpcpp-tools-reviewers
 
 # Clang offload tools
-clang/tools/clang-offload-bundler/ @mlychkov @sndmitriev @AlexeySachkov
-clang/tools/clang-offload-wrapper/ @mlychkov @sndmitriev @AlexeySachkov @kbobrovs
-clang/tools/clang-offload-deps/ @sndmitriev @mlychkov @AlexeySachkov
-clang/tools/clang-offload-extract/ @sndmitriev @mlychkov @AlexeySachkov
+clang/tools/clang-offload-*/ @intel/dpcpp-tools-reviewers
 
 # Explicit SIMD
-SYCLLowerIR/ @kbobrovs @sndmitriev @kychendev @v-klochkov 
-esimd/ @kbobrovs @v-klochkov @kychendev
-sycl/include/sycl/ext/intel/experimental/esimd.hpp @kbobrovs @v-klochkov @kychendev
-sycl/doc/extensions/ExplicitSIMD/ @kbobrovs @v-klochkov @kychendev
-
-# ITT annotations
-llvm/lib/Transforms/Instrumentation/SPIRITTAnnotations.cpp @MrSidims @vzakhari
-llvm/include/llvm/Transforms/Instrumentation/SPIRITTAnnotations.h @MrSidims @vzakhari
-llvm/test/Transforms/SPIRITTAnnotations/* @MrSidims @vzakhari
-
-# Generic address space support for printf
-llvm/lib/SYCLLowerIR/MutatePrintfAddrspace.cpp @intel/dpcpp-tools-reviewers
-llvm/include/llvm/SYCLLowerIR/MutatePrintfAddrspace.h @intel/dpcpp-tools-reviewers
-llvm/test/SYCLLowerIR/printf_addrspace/* @intel/dpcpp-tools-reviewers
+SYCLLowerIR/ @intel/dpcpp-esimd-reviewers
+esimd/ @intel/dpcpp-esimd-reviewers
+sycl/include/sycl/ext/intel/experimental/esimd.hpp @intel/dpcpp-esimd-reviewers
+sycl/doc/extensions/ExplicitSIMD/ @intel/dpcpp-esimd-reviewers