diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3e8794fb5f26e..7f003a0483416 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,10 +5,10 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-* @lantiga @borda @tchaton @justusschock @ethanwharris
+* @lantiga @tchaton @justusschock @ethanwharris
 
 # Docs
-/.github/*.md                               @williamfalcon @lantiga @borda
+/.github/*.md                               @williamfalcon @lantiga
 /docs/source-fabric/index.rst               @williamfalcon @lantiga
 /docs/source-pytorch/index.rst              @williamfalcon @lantiga
 /docs/source-pytorch/levels                 @williamfalcon @lantiga
@@ -16,8 +16,8 @@
 /.github/CODEOWNERS                  @williamfalcon
 /SECURITY.md                         @williamfalcon @lantiga
 /README.md                           @williamfalcon @lantiga
-/src/pytorch_lightning/__about__.py  @williamfalcon @lantiga @borda
-/src/lightning_fabric/__about__.py   @williamfalcon @lantiga @borda
+/src/pytorch_lightning/__about__.py  @williamfalcon @lantiga
+/src/lightning_fabric/__about__.py   @williamfalcon @lantiga
 
 /src/lightning/fabric/loggers        @williamfalcon
 /src/lightning/pytorch/loggers       @williamfalcon
diff --git a/docs/source-pytorch/community/governance.rst b/docs/source-pytorch/community/governance.rst
index b4345a33f3626..cfb9473a37eb8 100644
--- a/docs/source-pytorch/community/governance.rst
+++ b/docs/source-pytorch/community/governance.rst
@@ -19,15 +19,15 @@ Role: All final decisions related to Lightning.
 Maintainers
 -----------
 - Luca Antiga (`lantiga <https://github.com/lantiga>`_)
-- Jirka Borovec (`Borda <https://github.com/Borda>`_)
-- Justus Schock (`justusschock <https://github.com/justusschock>`_)
+- Ethan Harris (`ethanwharris <https://github.com/ethanwharris>`_) (Torchbearer founder)
 
 
 Emeritus Maintainers
 --------------------
-- Ethan Harris (`ethanwharris <https://github.com/ethanwharris>`_) (Torchbearer founder)
+- Justus Schock (`justusschock <https://github.com/justusschock>`_)
 - Nicki Skafte (`SkafteNicki <https://github.com/SkafteNicki>`_)
 - Thomas Chaton (`tchaton <https://github.com/tchaton>`_)
+- Jirka Borovec (`Borda <https://github.com/Borda>`_)
 
 
 Alumni