diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000000..dcb590784b4af
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,40 @@
+# All
+** @argoproj/argocd-approvers
+
+# Docs
+/docs/** @argoproj/argocd-approvers
+
+# CI
+/.github/**       @argoproj/argocd-approvers
+/.goreleaser.yaml @argoproj/argocd-approvers
+
+# owners:
+# - alexmt
+# - jessesuen
+#
+# approvers:
+# - alexec
+# - alexmt
+# - jannfis
+# - jessesuen
+# - jgwest
+# - keithchong
+# - mayzhang2000
+# - rbreeze
+# - leoluz
+# - crenshaw-dev
+# - pasha-codefresh
+#
+# reviewers:
+# - terrytangyuan
+# - wtam2018
+# - ishitasequeira
+# - reginapizza
+# - hblixt
+# - chetan-rns
+# - wanghong230
+# - ciiay
+# - saumeya
+# - zachaller
+# - 34fathombelow
+# - alexef
diff --git a/OWNERS b/OWNERS
deleted file mode 100644
index 3c122f95c3dd2..0000000000000
--- a/OWNERS
+++ /dev/null
@@ -1,32 +0,0 @@
-owners:
-- alexmt
-- jessesuen
-
-approvers:
-- alexec
-- alexmt
-- jannfis
-- jessesuen
-- jgwest
-- keithchong
-- mayzhang2000
-- rbreeze
-- leoluz
-- crenshaw-dev
-- pasha-codefresh
-
-reviewers:
-- dthomson25
-- tetchel
-- terrytangyuan
-- wtam2018
-- ishitasequeira
-- reginapizza
-- hblixt
-- chetan-rns
-- wanghong230
-- ciiay
-- saumeya
-- zachaller
-- 34fathombelow
-- alexef