diff --git a/Maintainers.txt b/Maintainers.txt
index 7c0b4cb58c..8fdafcb6c7 100644
--- a/Maintainers.txt
+++ b/Maintainers.txt
@@ -104,19 +104,19 @@ EDK II Continuous Integration:
 .azurepipelines/
 F: .azurepipelines/
 M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
-M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]
+M: Joey Vagedes <joey.vagedes@gmail.com> [javagedes]
 R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
 R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
 
 .devcontainer/
 F: .devcontainer/
-M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]
+M: Joey Vagedes <joey.vagedes@gmail.com> [javagedes]
 R: Chris Fernald <chris.fernald@outlook.com> [cfernald]
 
 .github/
 F: .github/
 M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
-M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]
+M: Joey Vagedes <joey.vagedes@gmail.com> [javagedes]
 R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
 
 .mergify/
@@ -128,7 +128,7 @@ R: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
 .pytool/
 F: .pytool/
 M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
-M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]
+M: Joey Vagedes <joey.vagedes@gmail.com> [javagedes]
 R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
 R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]
 
@@ -166,7 +166,7 @@ R: Yuwei Chen <yuwei.chen@intel.com> [YuweiChen1110]
 BaseTools: Plugins
 F: BaseTools/Plugin/
 M: Sean Brogan <sean.brogan@microsoft.com> [spbrogan]
-M: Michael Kubacki <mikuback@linux.microsoft.com> [makubacki]
+M: Joey Vagedes <joey.vagedes@gmail.com> [javagedes]
 R: Michael D Kinney <michael.d.kinney@intel.com> [mdkinney]
 R: Liming Gao <gaoliming@byosoft.com.cn> [lgao4]