diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71d8193613bf4..197eededddf00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Added experimental support for extensions ([#5347](https://github.com/opensearch-project/OpenSearch/pull/5347)), ([#5518](https://github.com/opensearch-project/OpenSearch/pull/5518), ([#5597](https://github.com/opensearch-project/OpenSearch/pull/5597)), ([#5615](https://github.com/opensearch-project/OpenSearch/pull/5615)))
 - Add CI bundle pattern to distribution download ([#5348](https://github.com/opensearch-project/OpenSearch/pull/5348))
 - Add support for ppc64le architecture ([#5459](https://github.com/opensearch-project/OpenSearch/pull/5459))
+- Added @gbbafna as an OpenSearch maintainer ([#5668](https://github.com/opensearch-project/OpenSearch/pull/5668))
 
 
 ### Dependencies
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 789e250e10d19..5a0b89842a67e 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -11,6 +11,7 @@
 | Bukhtawar Khan | [Bukhtawar](https://github.com/Bukhtawar) | Amazon |
 | Charlotte Henkle | [CEHENKLE](https://github.com/CEHENKLE) | Amazon |
 | Daniel "dB." Doubrovkine | [dblock](https://github.com/dblock) | Amazon |
+| Gaurav Bafna | [gbbafna](https://github.com/gbbafna) | Amazon |
 | Himanshu Setia | [setiah](https://github.com/setiah) | Amazon |
 | Kartik Ganesh | [kartg](https://github.com/kartg) | Amazon |
 | Kunal Kotwani | [kotwanikunal](https://github.com/kotwanikunal) | Amazon |