diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 30c4cd80b7..da8ff27410 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -10,20 +10,18 @@
 # owners
 /.github/CODEOWNERS   @williamfalcon
 # main
-/README.md            @edenlightning @ethanwharris
+/README.md            @ethanwharris @krshrimali
 # installation
-/setup.py                 @borda @ethanwharris
-/__about__.py             @borda @ethanwharris
-/__init__.py              @borda @ethanwharris
+/setup.py                 @borda @ethanwharris @krshrimali
+/__about__.py             @borda @ethanwharris @krshrimali
+/__init__.py              @borda @ethanwharris @krshrimali
 
 # CI/CD
-/.github/workflows/   @borda @ethanwharris
+/.github/workflows/   @borda @ethanwharris @krshrimali
 # configs in root
-/*.yml                @borda @ethanwharris
+/*.yml                @borda @ethanwharris @krshrimali
 
 # Docs
-/docs/                          @edenlightning @ethanwharris
-/.github/*.md                   @edenlightning @ethanwharris
-/.github/ISSUE_TEMPLATE/*.md    @edenlightning @ethanwharris
+/.github/ISSUE_TEMPLATE/*.md    @borda @ethanwharris @krshrimali
 /docs/source/conf.py            @borda @ethanwharris
 /flash/core/integrations/labelstudio	@KonstantinKorotaev @niklub
diff --git a/docs/source/governance.rst b/docs/source/governance.rst
index 53a5c66363..22594c8207 100644
--- a/docs/source/governance.rst
+++ b/docs/source/governance.rst
@@ -6,13 +6,13 @@ Flash Governance | Persons of interest
 Leads
 -----
 - Ethan Harris (`ethanwharris <https://github.com/ethanwharris>`_)
+- Kushashwa Ravi Shrimali (`krshrimali <https://github.com/krshrimali>`_)
 - Thomas Chaton (`tchaton <https://github.com/tchaton>`_)
-- William Falcon (`williamFalcon <https://github.com/williamFalcon>`_)
 
 Core Maintainers
 ----------------
+- William Falcon (`williamFalcon <https://github.com/williamFalcon>`_)
 - Jirka Borovec (`Borda <https://github.com/Borda>`_)
-- Kushashwa Ravi Shrimali (`krshrimali <https://github.com/krshrimali>`_)
 - Kaushik Bokka (`kaushikb11 <https://github.com/kaushikb11>`_)
 - Justus Schock (`justusschock <https://github.com/justusschock>`_)
 - Akihiro Nitta (`akihironitta <https://github.com/akihironitta>`_)