diff --git a/CODEOWNERS b/CODEOWNERS
index 3eea359522..28eeb29a97 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -7,11 +7,11 @@ go.mod @fleetdm/go
 /cmd/ @fleetdm/go
 
 # Infra/terraform
-*.tf @edwardsb @zwinnerman-fleetdm
-/infrastructure/ @zwinnerman-fleetdm @edwardsb
+*.tf @edwardsb @zwinnerman-fleetdm @rfairburn
+/infrastructure/ @zwinnerman-fleetdm @edwardsb @rfairburn
 
 # GitHub settings + actions
-/.github/ @zwass
+/.github/ @g-platform
 
 # Changelog
 CHANGELOG.md @noahtalerman