diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..fafc2681f
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,20 @@
+# cpp code owners
+cpp/               @rapidsai/cuspatial-cpp-codeowners
+
+# python code owners
+python/            @rapidsai/cuspatial-python-codeowners
+
+# cmake code owners
+**/CMakeLists.txt  @rapidsai/cuspatial-cmake-codeowners
+**/cmake/          @rapidsai/cuspatial-cmake-codeowners
+
+# java code owners
+java/              @rapidsai/cuspatial-java-codeowners
+
+# build/ops code owners
+.github/           @rapidsai/cuspatial-ops-codeowners 
+ci/                @rapidsai/cuspatial-ops-codeowners
+conda/             @rapidsai/cuspatial-ops-codeowners
+**/Dockerfile      @rapidsai/cuspatial-ops-codeowners
+**/.dockerignore   @rapidsai/cuspatial-ops-codeowners
+docker/            @rapidsai/cuspatial-ops-codeowners
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2fa72de2..085f43f5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 
 ## Improvements
 
+- #31 Add Github CODEOWNERS
+
 ## Bug Fixes
 
 - PR #16 `cuspatial::subset_trajectory_id()` test improvements and bug fixes