diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..155132ce6e5
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,10 @@
+# The files matching the globs will be assigned to the @usernames that follow
+.*                                          @benelan @jcfranco
+*.json                                      @benelan @jcfranco
+CHANGELOG.md                                @benelan @jcfranco @geospatialem
+.github/                                    @benelan @jcfranco @geospatialem
+support/                                    @benelan @jcfranco
+/packages/calcite-components-react          @benelan @jcfranco
+/packages/eslint-plugin-calcite-components  @jcfranco
+/packages/calcite-design-tokens             @alisonailea
+
diff --git a/CODEOWNERS b/CODEOWNERS
deleted file mode 100644
index 92638df17af..00000000000
--- a/CODEOWNERS
+++ /dev/null
@@ -1,12 +0,0 @@
-# These owners will be the default owners for everything in the repo.
-*                                          @esri/calcite-components-reviewers
-
-# The files matching the globs will be assigned to the @usernames that follow
-.*                                         @benelan @jcfranco @driskull @geospatialem
-*.json                                     @benelan @jcfranco @driskull @geospatialem
-CHANGELOG.md                               @benelan @jcfranco @driskull @geospatialem
-/packages/calcite-components/readme.md     @benelan @jcfranco @driskull @geospatialem
-.github/                                   @benelan @jcfranco @driskull @geospatialem
-support/                                   @benelan @jcfranco @driskull @geospatialem
-/packages/calcite-components-react         @benelan @jcfranco @driskull @geospatialem
-/packages/eslint-plugin-calcite-components @benelan @jcfranco @driskull @geospatialem