diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 07c1d1d18d..cf472e2cc4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -121,13 +121,17 @@
 # R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
 /.azurepipelines/**  @spbrogan @corthon
 
-# .github/
-# F: .github/
+# Tianocore Stewards must approve changes to CODEOWNERS and REVIEWERS
+/.github/CODEOWNERS   @ajfish  @leiflindholm  @mdkinney
+/.github/REVIEWERS    @ajfish  @leiflindholm  @mdkinney
+
+# .github/workflows/
+# F: .github/workflows/
 # M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
 # M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]
 # R: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
 # R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
-/.github/**  @mdkinney @makubacki
+/.github/workflows/**  @mdkinney @makubacki
 
 # .mergify/
 # F: .mergify/
diff --git a/.github/REVIEWERS b/.github/REVIEWERS
index d645604c85..683d8bbf53 100644
--- a/.github/REVIEWERS
+++ b/.github/REVIEWERS
@@ -120,13 +120,13 @@
 # R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
 /.azurepipelines/**  @mdkinney @lgao4
 
-# .github/
-# F: .github/
+# .github/workflows/
+# F: .github/workflows/
 # M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
 # M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]
 # R: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
 # R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
-/.github/**  @spbrogan @lgao4
+/.github/workflows/**  @spbrogan @lgao4
 
 # .mergify/
 # F: .mergify/
diff --git a/Maintainers.txt b/Maintainers.txt
index d5fb4a1ab6..edb4955ea0 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -111,8 +111,20 @@ M: Bret Barkelew <Bret.Barkelew@microsoft.com> [corthon]
 R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
 R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
 
-.github/
-F: .github/
+.github/CODEOWNERS
+F: .github/CODEOWNERS
+M: Andrew Fish <afish@apple.com> [ajfish]
+M: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
+
+.github/REVIEWERS
+F: .github/REVIEWERS
+M: Andrew Fish <afish@apple.com> [ajfish]
+M: Leif Lindholm <quic_llindhol@quicinc.com> [leiflindholm]
+M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
+
+.github/workflows/
+F: .github/workflows/
 M: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
 M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]
 R: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]