diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a7482c406e..9d977733e7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,3 @@
-# Generic Ownership (broadest rules first)
-**/next-cmake/                                                        @ROCm/rocm-math-lib-build-infra
-
 # CI ownership
 /.azuredevops/                                                        @ROCm/external-ci
 /.github/                                                             @ROCm/rocm-systems-reviewers
@@ -14,6 +11,10 @@
 
 # Project-specific ownership
 /projects/aqlprofile/                                                 @ammarwa @bgopesh
+/projects/clr/                                                        @ROCm/clr-reviewers
+/projects/hip/                                                        @ROCm/hip-reviewers
+/projects/hipother/                                                   @ROCm/hipother-reviewers
+/projects/hip-tests/                                                  @ROCm/hip-tests-reviewers
 /projects/rdc/                                                        @dmitrii-galantsev @bill-shuzhou-liu
 /projects/rocm-core/                                                  @nunnikri @frepaul @raramakr @ashutom @amd-isparry @arvindcheru
 /projects/rocm-smi-lib/                                               @bill-shuzhou-liu @dmitrii-galantsev @charis-poag-amd @oliveiradan
@@ -26,6 +27,16 @@
 /projects/rocr-runtime/                                               @kentrussell @dayatsin-amd @cfreeamd
 /projects/roctracer/                                                  @ammarwa @bgopesh
 
+# Language runtime build infra code owners
+/projects/clr/**/*.cmake                                              @ROCm/clr-reviewers @ROCm/lrt-build-infra
+/projects/clr/**/CMakeLists.txt                                       @ROCm/clr-reviewers @ROCm/lrt-build-infra
+/projects/hip/**/*.cmake                                              @ROCm/hip-reviewers @ROCm/lrt-build-infra
+/projects/hip/**/CMakeLists.txt                                       @ROCm/hip-reviewers @ROCm/lrt-build-infra
+/projects/hipother/**/*.cmake                                         @ROCm/hipother-reviewers @ROCm/lrt-build-infra
+/projects/hipother/**/CMakeLists.txt                                  @ROCm/hipother-reviewers @ROCm/lrt-build-infra
+/projects/hip-tests/**/*.cmake                                        @ROCm/hip-tests-reviewers @ROCm/lrt-build-infra
+/projects/hip-tests/**/CMakeLists.txt                                 @ROCm/hip-tests-reviewers @ROCm/lrt-build-infra
+
 # rocprofiler-sdk section-specific code owners
 /projects/rocprofiler-sdk/source/docs                                 @bgopesh
 /projects/rocprofiler-sdk/source/include                              @jrmadsen      @bwelton     @ammarwa
@@ -55,6 +66,17 @@
 /projects/aqlprofile/**/*.md                                          @ammarwa @bgopesh @ROCm/rocm-documentation
 /projects/aqlprofile/**/*.rst                                         @ammarwa @bgopesh @ROCm/rocm-documentation
 
+/projects/clr/**/*.md                                                 @ROCm/clr-reviewers @ROCm/lrt-docs-reviewers
+/projects/clr/**/*.rst                                                @ROCm/clr-reviewers @ROCm/lrt-docs-reviewers
+/projects/clr/**/.readthedocs.yaml                                    @ROCm/clr-reviewers @ROCm/lrt-docs-reviewers
+/projects/clr/hipamd/include/                                         @ROCm/clr-reviewers @ROCm/lrt-docs-reviewers
+
+/projects/hip/**/*.md                                                 @ROCm/hip-reviewers @ROCm/lrt-docs-reviewers
+/projects/hip/**/*.rst                                                @ROCm/hip-reviewers @ROCm/lrt-docs-reviewers
+/projects/hip/**/.readthedocs.yaml                                    @ROCm/hip-reviewers @ROCm/lrt-docs-reviewers
+/projects/hip/docs/                                                   @ROCm/hip-reviewers @ROCm/lrt-docs-reviewers
+/projects/hip/include/                                                @ROCm/hip-reviewers @ROCm/lrt-docs-reviewers
+
 /projects/rdc/**/*.md                                                 @dmitrii-galantsev @bill-shuzhou-liu @ROCm/rocm-documentation
 /projects/rdc/**/*.rst                                                @dmitrii-galantsev @bill-shuzhou-liu @ROCm/rocm-documentation
 /projects/rdc/**/.readthedocs.yaml                                    @dmitrii-galantsev @bill-shuzhou-liu @ROCm/rocm-documentation