diff --git a/CODEOWNERS b/CODEOWNERS
index 52f538b693..2843950bda 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -11,8 +11,8 @@ go.mod @fleetdm/go
 /infrastructure/ @zwinnerman-fleetdm @edwardsb @rfairburn
 /charts/ @zwinnerman-fleetdm @edwardsb @rfairburn
 
-# GitHub settings + actions
-/.github/ @fleetdm/g-platform
+# GitHub settings + actions + issue templates
+/.github/ @zwass @mikermcneil
 
 # Codeowners file
 /CODEOWNERS @zwass @mikermcneil
@@ -20,12 +20,8 @@ go.mod @fleetdm/go
 # Changelog
 /CHANGELOG.md @noahtalerman
 
-# Fleet documentation
-# TODO: will anyone be auto-requested as reviewer for docs?
-# previously this was:
-# /docs/ @chris-mcgillicuddy
-# then mikermcneil added more folks, but it was a bad idea that resulted in a lot of extra notifications to ≥3 people.
-# So instead, who will be DRI for reviewing docs?
+# Fleet documentation (who is auto-requested as reviewer for changes to docs?)
+/docs/ @ksatter
 
 # REST API reference documentation
 /docs/Using-Fleet/REST-API.md @ksatter @lukeheath
@@ -38,7 +34,7 @@ go.mod @fleetdm/go
 /schema @guillaumeross
 
 # Articles
-/articles @chris-mcgillicuddy
+/articles @mikermcneil
 
 # Website
 /website/ @eashaw