diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0ab4322b..80054371 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @thejcannon @neilvana
+* @irwand @neilvana
diff --git a/.github/workflows/Notify-Convention-Change.md b/.github/workflows/Notify-Convention-Change.md
index bc019bef..5036aa62 100644
--- a/.github/workflows/Notify-Convention-Change.md
+++ b/.github/workflows/Notify-Convention-Change.md
@@ -14,4 +14,3 @@ Since this changes the Coding Conventions, I'll @-mention the appropriate NI eng
 @rtzoeller
 @sbethur
 @stick152
-@thejcannon