diff --git a/CODEOWNERS b/CODEOWNERS
index e6f1fe8f7..b7a3507f7 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -26,13 +26,13 @@ src/audio/eq_iir*			@singalsu
 src/audio/tone.c			@singalsu
 src/audio/kpb.c				@mrajwa
 src/audio/mux/*				@akloniex
-src/audio/dcblock*			@cujomalainey @dgreid @johnylin76
-src/audio/crossover*			@cujomalainey @dgreid @johnylin76
+src/audio/dcblock*			@cujomalainey @chiang831 @johnylin76
+src/audio/crossover*			@cujomalainey @chiang831 @johnylin76
 src/audio/tdfb*                         @singalsu
-src/audio/drc/*				@johnylin76 @cujomalainey @dgreid
-src/audio/multiband_drc/*		@johnylin76 @cujomalainey @dgreid
+src/audio/drc/*				@johnylin76 @cujomalainey @chiang831
+src/audio/multiband_drc/*		@johnylin76 @cujomalainey @chiang831
 src/audio/codec_adapter/*		@cujomalainey @mrajwa @dbaluta
-src/audio/google_hotword_detect.c	@benzh @cujomalainey @dgreid @johnylin76
+src/audio/google_hotword_detect.c	@benzh @cujomalainey @chiang831 @johnylin76
 
 # platforms
 src/platform/haswell/*			@randerwang
@@ -66,9 +66,9 @@ tools/testbench/*			@ranj063
 tools/test/audio/*			@singalsu
 tools/ctl/*				@singalsu
 tools/tune/*				@singalsu
-tools/tune/crossover/*			@cujomalainey @johnylin76 @dgreid
-tools/tune/dcblock/*			@cujomalainey @johnylin76 @dgreid
-tools/tune/drc/*			@cujomalainey @johnylin76 @dgreid
+tools/tune/crossover/*			@cujomalainey @johnylin76 @chiang831
+tools/tune/dcblock/*			@cujomalainey @johnylin76 @chiang831
+tools/tune/drc/*			@cujomalainey @johnylin76 @chiang831
 tools/oss-fuzz/*			@cujomalainey
 
 # build system