diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4f9e93b949..f1e6e5c98a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -35,14 +35,14 @@
 /projects/hip-tests/**/CMakeLists.txt                                 @ROCm/hip-tests-reviewers @ROCm/lrt-build-infra
 
 # rocr-runtime section-specific code owners
-/projects/rocr-runtime/libhsakmt                                      @kentrussell @dayatsin-amd
+/projects/rocr-runtime/libhsakmt                                      @kentrussell @dayatsin-amd @cfreeamd
 /projects/rocr-runtime/libhsakmt/tests/kfdtest                        @kentrussell @xiaogang-chen-amd
 /projects/rocr-runtime/rocrtst                                        @shwetagkhatri @cfreeamd
-/projects/rocr-runtime/runtime/hsa-runtime/core/driver/xdna           @atgutier @ypapadop-amd
-/projects/rocr-runtime/runtime/hsa-runtime/core/driver/virtio         @dayatsin-amd
-/projects/rocr-runtime/runtime/hsa-runtime/loader                     @dayatsin-amd @kzhuravl
-/projects/rocr-runtime/runtime/hsa-runtime/image                      @shwetagkhatri
-/projects/rocr-runtime/runtime/hsa-runtime/pcs                        @shwetagkhatri @dayatsin-amd
+/projects/rocr-runtime/runtime/hsa-runtime/core/driver/xdna           @atgutier @ypapadop-amd @dayatsin-amd @cfreeamd
+/projects/rocr-runtime/runtime/hsa-runtime/core/driver/virtio         @dayatsin-amd @cfreeamd
+/projects/rocr-runtime/runtime/hsa-runtime/loader                     @dayatsin-amd @kzhuravl @cfreeamd
+/projects/rocr-runtime/runtime/hsa-runtime/image                      @shwetagkhatri @dayatsin-amd @cfreeamd
+/projects/rocr-runtime/runtime/hsa-runtime/pcs                        @shwetagkhatri @dayatsin-amd @cfreeamd
 
 # Documentation-specific ownership by project