diff --git a/CODEOWNERS b/CODEOWNERS
index ec55019b37..503a7e6a18 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -6,4 +6,8 @@ go.mod @fleetdm/go
 /server/ @fleetdm/go
 /cmd/ @fleetdm/go
 
-*.tf @edwardsb
\ No newline at end of file
+# Infra/terraform
+*.tf @edwardsb
+
+# GitHub settings + actions
+/.github/ @zwass