diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 56098b9c73..effb470abb 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,7 +1,13 @@
-* @koomie @coleramos425
+* @coleramos425 @feizheng10 @dgaliffiAMD
 
 # Documentation files
 docs/ @ROCm/rocm-documentation
 *.md @ROCm/rocm-documentation
 *.rst @ROCm/rocm-documentation
 .readthedocs.yaml @ROCm/rocm-documentation
+
+# Packaging
+cmake/ @koomie
+tests/ @koomie
+CMakeLists.txt @koomie
+utils/ @koomie
\ No newline at end of file