diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 935ac6772e0..2efd64f8cec 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,24 +1,24 @@
-.github/CODEOWNERS @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @patmill
-common/autoinstallers/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @patmill
-common/config/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @patmill
+.github/CODEOWNERS @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+common/autoinstallers/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+common/config/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
 
-common/reviews/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
+common/reviews/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
 
-apps/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-build-tests/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-build-tests-samples/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-eslint/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-heft-plugins/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-libraries/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-repo-scripts/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-rigs/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-rush-plugins/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-stack/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-tutorials/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-webpack/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @TheLarkInn
-rush.json @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-.gitattributes @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-.gitignore @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
-README.md @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft
+apps/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+build-tests/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+build-tests-samples/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+build-tests-subspace/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+eslint/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+heft-plugins/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+libraries/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+repo-scripts/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+rigs/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+rush-plugins/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+vscode-extensions/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+webpack/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha @TheLarkInn
+rush.json @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+.gitattributes @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+.gitignore @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
+README.md @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha
 
-libraries/load-themed-styles/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @dzearing
+libraries/load-themed-styles/**/* @iclanton @octogonz @apostolisms @D4N14L @dmichon-msft @jxanthony @bmiddha @dzearing