diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..34a3c853c
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+* @Microsoft/ApplicationInsights-JS-owners @microsoft/ApplicationInsights-JS-contributors
+/.github/CODEOWNERS @Microsoft/ApplicationInsights-JS-owners
diff --git a/CODEOWNERS b/CODEOWNERS
index 9d7f5e98e..aaa7c2f9d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @Microsoft/ApplicationInsights-JS-owners
+* @microsoft/ApplicationInsights-JS-CodeOwners @microsoft/ApplicationInsights-JS-contributors