diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bb4f960..251c7b0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,19 +1,19 @@
 # See doc/org-repo.md
 
-/README.md @infinisil @zimbatm
-/CONTRIBUTING.md @infinisil @zimbatm
-/LICENSE @infinisil @zimbatm
+/README.md @NixOS/org
+/CONTRIBUTING.md @NixOS/org
+/LICENSE @NixOS/org
 
-/.github/CODEOWNERS @infinisil @zimbatm
-/.github/workflows @infinisil @zimbatm
-/scripts @infinisil @zimbatm
+/.github/CODEOWNERS @NixOS/org
+/.github/workflows @NixOS/org
+/scripts @NixOS/org
 
-/doc/org-repo.md @infinisil @zimbatm
-/doc/discourse.md @infinisil @zimbatm
-/doc/github.md @infinisil @zimbatm
-/doc/matrix.md @infinisil @zimbatm
-/doc/moderation.md @infinisil @zimbatm
-/doc/nixos-releases.md @infinisil @zimbatm
-/doc/resources.md @infinisil @zimbatm
-/doc/rfcs.md @infinisil @zimbatm
-/doc/teams.md @infinisil @zimbatm
+/doc/org-repo.md @NixOS/org
+/doc/discourse.md @NixOS/org
+/doc/github.md @NixOS/org
+/doc/matrix.md @NixOS/org
+/doc/moderation.md @NixOS/org
+/doc/nixos-releases.md @NixOS/org
+/doc/resources.md @NixOS/org
+/doc/rfcs.md @NixOS/org
+/doc/teams.md @NixOS/org