diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ee246a32..747b8e58 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,8 @@
-# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/docs
\ No newline at end of file
+@ariamarble
+@carolxob
+@cwillum
+@hdhalter
+@JeffH-AWS
+@kolchfa-aws
+@Naarcha-AWS
+@vagimeli