diff --git a/CODEOWNERS b/CODEOWNERS
index caa51a3ba96f9..a6e624d833a91 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,11 +2,11 @@
 ** @argoproj/argocd-approvers
 
 # Docs
-/docs/** @argoproj/argocd-approvers @todaywasawesome @34fathombelow @blakepettersson
+/docs/** @argoproj/argocd-approvers @argoproj/argocd-approvers-docs
 
 # CI
-/.github/**       @argoproj/argocd-approvers @34fathombelow
-/.goreleaser.yaml @argoproj/argocd-approvers @34fathombelow
+/.github/**       @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
+/.goreleaser.yaml @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
 
 # owners:
 # - alexmt