diff --git a/CODEOWNERS b/CODEOWNERS
index 37dd2199a..bc21824fa 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,8 +1,8 @@
 # Auto-generated, do not edit; see CODEOWNERS.in
-* @Jaanki @Oats87 @skitt @sridhargaddam @tpantelis
-*.md @dfarrell07 @Jaanki @Oats87 @skitt @sridhargaddam @tpantelis
-/.github/workflows/ @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
-/scripts/ @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
-build/* @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
-Dockerfile.dapper @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
-Makefile* @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis
+* @Jaanki @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+*.md @dfarrell07 @Jaanki @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+/.github/workflows/ @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+/scripts/ @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+build/* @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+Dockerfile.dapper @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
+Makefile* @Jaanki @mkolesnik @Oats87 @skitt @sridhargaddam @tpantelis @vthapar
diff --git a/CODEOWNERS.in b/CODEOWNERS.in
index ef5169e16..a31c71681 100644
--- a/CODEOWNERS.in
+++ b/CODEOWNERS.in
@@ -1,7 +1,8 @@
 @dfarrell07 *.md
+@Jaanki *
 @mkolesnik /.github/workflows/ /scripts/ Makefile* Dockerfile.dapper build/*
 @Oats87 *
 @skitt *
 @sridhargaddam *
 @tpantelis *
-@Jaanki *
+@vthapar *