diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 01d89f760e..96f43f3841 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,46 +8,37 @@
 * @lantiga @borda @tchaton @awaelchli
 
 # CI/CD and configs
-/.actions/                  @borda @carmocca @ethanwharris @justusschock
-/.github/                   @borda @carmocca @ethanwharris @justusschock
-/.azure/                    @borda @carmocca @ethanwharris @justusschock
+/.actions/                  @borda @ethanwharris @justusschock
+/.github/                   @borda @ethanwharris @justusschock
+/.azure/                    @borda @ethanwharris @justusschock
 /.azure/app-cloud-e2e.yml   @awaelchli @ethanwharris @lantiga
-/dockers/                   @borda @carmocca @ethanwharris @justusschock
-*.yml                       @borda @carmocca @ethanwharris @justusschock
+/dockers/                   @borda @ethanwharris @justusschock
+*.yml                       @borda @ethanwharris @justusschock
 
 # Docs
-/docs/                                      @edenlightning @lantiga @borda @awaelchli
-/docs/*/conf.py                             @borda @awaelchli @carmocca
-/.github/*.md                               @edenlightning @williamfalcon @lantiga @borda
-/.github/ISSUE_TEMPLATE/                    @edenlightning @borda @tchaton @awaelchli
-/docs/source-fabric/conf.py                 @borda @awaelchli @carmocca
-/docs/source-fabric/index.rst               @awaelchli @lantiga @carmocca
-/docs/source-pytorch/conf.py                @borda @awaelchli @carmocca
+/docs/                                      @lantiga @borda @awaelchli
+/docs/*/conf.py                             @borda @awaelchli
+/.github/*.md                               @williamfalcon @lantiga @borda
+/.github/ISSUE_TEMPLATE/                    @borda @tchaton @awaelchli
+/docs/source-fabric/conf.py                 @borda @awaelchli
+/docs/source-fabric/index.rst               @awaelchli @lantiga
+/docs/source-pytorch/conf.py                @borda @awaelchli
 /docs/source-pytorch/index.rst              @williamfalcon @lantiga
 /docs/source-pytorch/levels                 @williamfalcon @lantiga
-/docs/source-app/                           @williamfalcon @lantiga @tchaton @awaelchli
-/docs/source-app/index.rst                  @williamfalcon @lantiga
-/docs/source-app/expertise_levels           @williamfalcon @lantiga
+/docs/source-app/                           @williamfalcon @lantiga @tchaton
 
 # PyTorch Lightning
-/src/lightning/pytorch                      @williamfalcon @awaelchli @carmocca @justusschock
-/src/pytorch_lightning                      @williamfalcon @awaelchli @carmocca @justusschock
-/tests/tests_pytorch                        @awaelchli @carmocca @justusschock @borda
-
-# Core APIs
-/src/lightning/pytorch/callbacks/callback.py @williamfalcon @awaelchli @carmocca
-/src/lightning/pytorch/core/datamodule.py    @williamFalcon @awaelchli @carmocca
-/src/lightning/pytorch/trainer/trainer.py    @williamfalcon @tchaton @awaelchli @carmocca
-/src/lightning/pytorch/core/hooks.py         @williamfalcon @tchaton @awaelchli @carmocca
-/src/lightning/pytorch/core/module.py        @williamfalcon @tchaton @awaelchli @carmocca
+/src/lightning/pytorch                      @williamfalcon @awaelchli @justusschock
+/src/pytorch_lightning                      @williamfalcon @awaelchli @justusschock
+/tests/tests_pytorch                        @awaelchli @justusschock @borda
 
 # Lightning Data
-/src/lightning/data/      @tchaton
+/src/lightning/data/                        @tchaton @lantiga
 
 # Lightning Fabric
-/src/lightning/fabric                       @awaelchli @carmocca @justusschock
-/src/lightning_fabric                       @awaelchli @carmocca @justusschock
-/tests/tests_fabric                         @awaelchli @carmocca @justusschock
+/src/lightning/fabric                       @awaelchli @justusschock
+/src/lightning_fabric                       @awaelchli @justusschock
+/tests/tests_fabric                         @awaelchli @justusschock
 
 # Lightning App
 /src/lightning/app                          @tchaton @lantiga @awaelchli @ethanwharris
@@ -59,8 +50,8 @@
 /.github/CODEOWNERS                  @williamfalcon
 /SECURITY.md                         @williamfalcon @lantiga
 /README.md                           @williamfalcon @lantiga
-/setup.py                            @williamfalcon @borda @carmocca
-/src/pytorch_lightning/__about__.py  @williamfalcon @borda @carmocca
+/setup.py                            @williamfalcon @borda
+/src/pytorch_lightning/__about__.py  @williamfalcon @borda
 /src/lightning_app/__about__.py      @williamfalcon @lantiga @borda
 /src/lightning_fabric/__about__.py   @williamfalcon @borda @awaelchli
-/src/*/__setup__.py                  @borda @carmocca @justusschock
+/src/*/__setup__.py                  @borda @justusschock
diff --git a/docs/source-pytorch/community/governance.rst b/docs/source-pytorch/community/governance.rst
index 35306643c5..36b613d32d 100644
--- a/docs/source-pytorch/community/governance.rst
+++ b/docs/source-pytorch/community/governance.rst
@@ -19,7 +19,6 @@ Role: All final decisions related to Lightning.
 Maintainers
 -----------
 - Adrian Wälchli (`awaelchli <https://github.com/awaelchli>`_)
-- Carlos Mocholí (`carmocca <https://github.com/carmocca>`_)
 - Jirka Borovec (`Borda <https://github.com/Borda>`_)
 - Justus Schock (`justusschock <https://github.com/justusschock>`_)
 
@@ -33,6 +32,7 @@ Emeritus Maintainers
 
 Alumni
 ------
+- Carlos Mocholí (`carmocca <https://github.com/carmocca>`_)
 - Akihiro Nitta (`akihironitta <https://github.com/akihironitta>`_)
 - Ananth Subramaniam (`ananthsub <https://github.com/ananthsub>`_)
 - Danielle Pintz (`daniellepintz <https://github.com/daniellepintz>`_)