diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 99481ac70..40feb4e7e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,10 @@
-* @alexmt @crenshaw-dev @pasha-codefresh @ishitasequeira
+# All
+** @argoproj/argocd-approvers
+
+# Docs
+/docs/**     @argoproj/argocd-approvers @argoproj/argocd-approvers-docs
+/README.md   @argoproj/argocd-approvers @argoproj/argocd-approvers-docs
+
+# CI
+/.codecov.yml             @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
+/.github/**               @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
diff --git a/EMERITUS.md b/EMERITUS.md
deleted file mode 100644
index 4273c0e0e..000000000
--- a/EMERITUS.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Emeritus Approvers
-
-These are the people who have been maintainers/approvers in the past, and have since retired from the role.
-
-We thank them for their service to the project.
-
-| Emeritus | Role | GitHub ID |
-| -------- | ---- | --------- |
-| Alexander Matyushentsevx | owner/approver | [alexmt](https://github.com/alexmt) |
-| Jesse Suenx | owner | [jessesuen](https://github.com/jessesuen) |
-| Alex Collinsx | approver | [alexec](https://github.com/alexec) |
-| Jann Fischerx | approver | [jannfis](https://github.com/jannfis) |
-| May Zhangx | approver | [mayzhang2000](https://github.com/mayzhang2000) |
-| Mikhail Mazurskiyx | reviewer | [ash2k](https://github.com/ash2k) |
-| Danny Thomson | reviewer | [dthomson25](https://github.com/dthomson25) |