diff --git a/CODEOWNERS b/CODEOWNERS
index 6bf30b90602d..f548c2ad30cc 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -41,19 +41,24 @@
 /src/             @pllarroy
 /plugin/          @pllarroy
 
-# CMake
+# Build system
 CMakeLists.txt    @szha @pllarroy
 /cmake/           @szha @pllarroy
+/make/            @szha
 
 # MXNet CI
 dev_menu.py         @pllarroy
 /ci/                @pllarroy @marcoabreu @aaronmarkham
+/ci/publish/        @szha
 /docker/            @marcoabreu
 /tests/ci_build/    @marcoabreu
 Jenkinsfile         @marcoabreu
 .travis.yml         @marcoabreu
 appveyor.yml        @marcoabreu
 
+# MXNet CD
+/cd/                @szha
+
 # Build logic
 Makefile          @szha
 prepare_mkl.sh    @szha