diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 650d1b1180..9a4d2b1f36 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -16,8 +16,8 @@
 /packages/nimble-components @rajsite @jattasNI
 /packages/nimble-components/.storybook @rajsite @jattasNI @fredvisser
 /packages/nimble-components/src/wafer-map @rajsite @jattasNI @DStavilaNI @zszilagy
-/packages/nimble-components/src/rich-text-viewer @rajsite @jattasNI @vikisekarNI
-/packages/nimble-components/src/rich-text-editor @rajsite @jattasNI @vikisekarNI
+/packages/nimble-components/src/rich-text @rajsite @jattasNI @vivinkrishna-ni
+/packages/nimble-components/src/rich-text-mention @rajsite @jattasNI @vivinkrishna-ni
 /packages/nimble-tokens @rajsite @jattasNI @fredvisser
 /packages/site @rajsite @jattasNI
 /packages/xliff-to-json-converter @rajsite @TrevorKarjanis @jattasNI