diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 095c559..b2ecce3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # See ./org-repo.md
 
-/.github/CODEOWNERS @infinisil
+/.github/CODEOWNERS @infinisil @zimbatm
 
-/org-repo.md @infinisil
+/doc/org-repo.md @infinisil @zimbatm