diff --git a/projects/rocshmem/.github/CODEOWNERS b/projects/rocshmem/.github/CODEOWNERS
index 4ad64a6170..f4985a580e 100755
--- a/projects/rocshmem/.github/CODEOWNERS
+++ b/projects/rocshmem/.github/CODEOWNERS
@@ -1 +1 @@
-* @avinashkethineedi @akolliasAMD @Yiltan @BKP @abouteiller @edgargabriel @gaoikawa
+* @avinashkethineedi @akolliasAMD @Yiltan @BKP @abouteiller @edgargabriel @gaoikawa @omor1
diff --git a/projects/rocshmem/AUTHORS.md b/projects/rocshmem/AUTHORS.md
index dd6b48c017..79be998a65 100644
--- a/projects/rocshmem/AUTHORS.md
+++ b/projects/rocshmem/AUTHORS.md
@@ -12,4 +12,5 @@
 - Edgar Gabriel
 - Avinash Kethineedi
 - Yiltan Temucin
-- Aurelien Bouteiller
\ No newline at end of file
+- Aurelien Bouteiller
+- Omri Mor