diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 114f7767b52a4..583f2f7e65675 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,5 @@
+* @bader
+
 clang/ @erichkeane @Fznamznon
 
 clang/**/Driver @mdtoguchi @AGindinson
@@ -8,12 +10,10 @@ opencl-aot/ @dm-vodopyanov @AlexeySachkov @romanovvlad
 
 libdevice/ @asavonic @vzakhari
 
-sycl/doc/extensions/ @mkinsner @jbrodman
+sycl/ @romanovvlad @bader
 
 sycl/doc/ @pvchupin @kbobrovs
 
-sycl/ @romanovvlad @bader
+sycl/doc/extensions/ @mkinsner @jbrodman
 
 xpti/ @tovinkere @andykaylor
-
-* @bader