diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 01e7577fb..6e1bceccb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,15 +1,18 @@
 /3rdparty/amd @HaiShaw
-/docker @zhyncs @HaiShaw @merrymercy @Ying1123
+/docker @zhyncs @HaiShaw @ByronHsu
 /docs @zhaochenyang20
 /python/sglang/lang @merrymercy @Ying1123 @hnyls2002 @ByronHsu
 /python/sglang/srt @merrymercy @Ying1123 @hnyls2002 @zhyncs @ispobock @ByronHsu
 /python/sglang/srt/constrained @hnyls2002
-/python/sglang/srt/layers @merrymercy @Ying1123 @zhyncs @ispobock @HaiShaw @ch-wan
+/python/sglang/srt/disaggregation @hnyls2002 @ByronHsu
+/python/sglang/srt/distributed @yizhang2077
+/python/sglang/srt/entrypoints @zhaochenyang20
+/python/sglang/srt/layers @merrymercy @Ying1123 @zhyncs @ispobock @HaiShaw @ch-wan @BBuf
 /python/sglang/srt/lora @Ying1123 @Fridge003
 /python/sglang/srt/managers @merrymercy @Ying1123 @hnyls2002 @xiezhq-hermann
 /python/sglang/srt/mem_cache @merrymercy @Ying1123 @hnyls2002 @xiezhq-hermann
 /python/sglang/srt/model_executor @merrymercy @Ying1123 @hnyls2002 @zhyncs @ispobock
-/python/sglang/srt/models @merrymercy @Ying1123 @hnyls2002 @zhyncs @ispobock @ByronHsu
+/python/sglang/srt/models @merrymercy @Ying1123 @hnyls2002 @zhyncs @ispobock @ByronHsu @zhaochenyang20
 /python/sglang/srt/openai_api @merrymercy @Ying1123 @hnyls2002 @zhyncs @ispobock @ByronHsu @CatherineSue
 /python/sglang/srt/sampling @merrymercy @hnyls2002
 /python/sglang/srt/speculative @Ying1123 @merrymercy @rkooo567 @kssteven418