diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 24f6838702..fc3b20c491 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,8 +3,8 @@
 # Analysis period: 180 days
 # Minimum commits threshold: 1
 
-benchmarks/ @bkryu @cyx-6 @yzh119 @jiahanc @nv-yunzheq
-benchmarks/routines/ @bkryu @nv-yunzheq @cyx-6 @nvmbreughe @Anerudhan
+benchmarks/ @bkryu @jiahanc @cyx-6 @yzh119 @nv-yunzheq
+benchmarks/routines/ @bkryu @nv-yunzheq @jiahanc @cyx-6 @nvmbreughe
 ci/ @cyx-6 @yzh119 @nvmbreughe
 ci/scripts/ @cyx-6
 ci/scripts/jenkins/ @cyx-6
@@ -17,7 +17,7 @@ csrc/nv_internal/include/ @wenscarl @nv-yunzheq
 csrc/nv_internal/tensorrt_llm/ @wenscarl @djmmoss @nv-yunzheq @yongwww @cyx-6
 csrc/xqa/ @cyx-6 @yzh119
 docs/ @yzh119 @cyx-6 @wenscarl @nv-yunzheq @aleozlx
-flashinfer/ @yzh119 @cyx-6 @nvmbreughe @wenscarl @jiahanc
+flashinfer/ @yzh119 @cyx-6 @nvmbreughe @aleozlx @wenscarl
 flashinfer-cubin/ @yzh119 @cyx-6
 flashinfer-cubin/flashinfer_cubin/ @yzh119
 flashinfer-jit-cache/ @yzh119 @cyx-6
@@ -26,20 +26,20 @@ flashinfer/comm/ @yzh119 @cyx-6 @nvmbreughe @wenscarl @djmmoss
 flashinfer/cudnn/ @Anerudhan @yzh119 @cyx-6 @Anerudhan
 flashinfer/cute_dsl/ @yzh119 @kaixih @Amir-19 @aleozlx
 flashinfer/dsv3_ops/ @nvmbreughe
-flashinfer/fused_moe/ @djmmoss @yzh119 @cyx-6 @jiahanc @wenscarl
+flashinfer/fused_moe/ @djmmoss @jiahanc @yzh119 @cyx-6 @aleozlx
 flashinfer/gemm/ @nvmbreughe
-flashinfer/jit/ @yzh119 @cyx-6 @jiahanc @nvmbreughe @nv-yunzheq
+flashinfer/jit/ @yzh119 @cyx-6 @aleozlx @jiahanc @nvmbreughe
 flashinfer/jit/attention/ @yzh119 @cyx-6 @Anerudhan @joker-eph
 flashinfer/jit/gemm/ @yzh119 @nv-yunzheq @jiahanc
 flashinfer/logits_processor/ @cyx-6 @yzh119
 flashinfer/profiler/ @cyx-6
 flashinfer/triton/ @nvmbreughe @cyx-6
 flashinfer/tuning_configs/ @kaixih
-include/ @yzh119 @jiahanc @nvmbreughe @bkryu @wenscarl
-include/flashinfer/ @yzh119 @jiahanc @nvmbreughe @bkryu @wenscarl
+include/ @yzh119 @jiahanc @nvmbreughe @IwakuraRein @bkryu
+include/flashinfer/ @yzh119 @jiahanc @nvmbreughe @IwakuraRein @bkryu
 include/flashinfer/attention/ @yzh119 @kahyunnam @joker-eph
 include/flashinfer/comm/ @yongwww @nvmbreughe @djmmoss @yzh119 @cyx-6
-include/flashinfer/gemm/ @ttyio @yongwww @nvmbreughe @aleozlx
-include/flashinfer/trtllm/ @jiahanc @joker-eph @aleozlx @yzh119 @cyx-6
+include/flashinfer/gemm/ @ttyio @yongwww @yzh119 @nvmbreughe @aleozlx
+include/flashinfer/trtllm/ @jiahanc @joker-eph @aleozlx @yzh119 @wenscarl
 profiler/ @cyx-6
 scripts/ @yzh119 @nvmbreughe @dierksen @yongwww @bkryu