diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b38855ce2c..3ed5d9cb5e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,6 @@
 # DevInfra team is default owner of anything in the repo.
-* @swift-nav/devinfra
-/rust @notoriaga @pcrumley @isaactorz
-/c @swift-nav/algint-team @isaactorz
+* @swift-nav/algint-team
+/rust @notoriaga @pcrumley
+/c @swift-nav/algint-team
 
 # Add new codeowners above here
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c045facf81..1e3c63581d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,6 @@
 # Description
 
-@swift-nav/devinfra
+@swift-nav/algint-team
 
 <!-- Changes proposed in this PR -->