diff --git a/CODEOWNERS b/CODEOWNERS
index e7f03ec8b6..427c1003be 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -28,10 +28,10 @@ go.mod @fleetdm/go
 /docs/Contributing/API-for-contributors.md @ksatter @lukeheath
 
 # Standard query library YAML
-/docs/01-Using-Fleet/standard-query-library/standard-query-library.yml @guillaumeross
+/docs/01-Using-Fleet/standard-query-library/standard-query-library.yml @mikermcneil
 
 # Exapnded table documentation
-/schema @guillaumeross
+/schema @mikermcneil
 
 # Articles
 /articles @jarodreyes
@@ -68,7 +68,7 @@ go.mod @fleetdm/go
 /handbook/business-operations @hollidayn
 /handbook/business-operations/ceo-handbook.md @charlottechance
 /handbook/business-operations/* @hollidayn
-/handbook/security @guillaumeross
+/handbook/security @mikermcneil
 /handbook/engineering @zwass
 /handbook/product @zhumo
 /handbook/customers @alexmitchelliii