diff --git a/CODEOWNERS b/CODEOWNERS
index c68a880b8ca..6de54302500 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -28,13 +28,13 @@
 *.yml @charliegracie
 
 # CMake
-*.cmake @youngar @charliegracie
-/cmake/ @youngar @charliegracie
-**/CMakeLists.txt @youngar @charliegracie
+*.cmake @youngar @charliegracie @rwy0717
+/cmake/ @youngar @charliegracie @rwy0717
+**/CMakeLists.txt @youngar @charliegracie @rwy0717
 
 # GC
-/gc/ @charliegracie @youngar
-/glue/ @charliegracie @youngar
+/gc/ @charliegracie @youngar @rwy0717
+/glue/ @charliegracie @youngar @rwy0717
 
 # Compiler
 /compiler/ @0xdaryl @mstoodle
@@ -49,13 +49,13 @@
 /compiler/ilgen @mstoodle @Leonardo2718
 
 # Port Library
-/port/ @charliegracie @youngar
+/port/ @charliegracie @youngar @rwy0717
 
 # Thread Library
-/thread/ @charliegracie
+/thread/ @charliegracie @youngar @rwy0717
 
 # OMR Core Utilities
-/include_core/OMR/ @youngar @charliegracie @Leonardo2718
+/include_core/OMR/ @youngar @charliegracie @Leonardo2718 @rwy0717
 
 # Tril and Testing
 /fvtest/tril/ @Leonardo2718 @fjeremic @0xdaryl