diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f7128f81..266aeb78 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @IanHoang @gkamat @beaioun @cgchinmay @rishabh6788 @VijayanB
+* @IanHoang @gkamat @beaioun @cgchinmay @rishabh6788 @VijayanB @OVI3D0
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 6d03c637..64b67a71 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -12,3 +12,4 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Chinmay Gadgil          | [cgchinmay](https://github.com/cgchinmay)             | Amazon      | chinmay5j@gmail.com               |
 | Rishabh Singh           | [rishabh6788](https://github.com/rishabh6788)         | Amazon      | rishabhksingh@gmail.com           |
 | Vijayan Balasubramanian | [VijayanB](https://github.com/VijayanB)               | Amazon      | vijayan.balasubramanian@gmail.com |
+| Michael Oviedo          | [OVI3D0](https://github.com/OVI3D0)                   | Amazon      | michaeloviedo2000@gmail.com       |