diff --git a/CODEOWNERS b/CODEOWNERS
index da367e91f..a186c9840 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,8 +1,8 @@
 # Auto-generated, do not edit; see CODEOWNERS.in
-* @Oats87 @skitt @sridhargaddam @tpantelis
-*.md @dfarrell07 @Oats87 @skitt @sridhargaddam @tpantelis
-/.github/workflows/ @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
-/package/ @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
-/scripts/ @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
-Dockerfile.dapper @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
-Makefile* @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
+* @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+*.md @dfarrell07 @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+/.github/workflows/ @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+/package/ @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+/scripts/ @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+Dockerfile.dapper @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+Makefile* @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
diff --git a/CODEOWNERS.in b/CODEOWNERS.in
index aadd50592..98fcbe58f 100644
--- a/CODEOWNERS.in
+++ b/CODEOWNERS.in
@@ -4,3 +4,4 @@
 @skitt *
 @sridhargaddam *
 @tpantelis *
+@vthapar *