diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e1a36d3f57..d0cf8e6952 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,23 +5,45 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-* @williamfalcon @borda @teddykoker @awaelchli @nateraw @justusschock @tchaton @SeanNaren @ananyahjha93
+* @williamfalcon @borda @tchaton @SeanNaren @awaelchli @justusschock
 
 # Metrics
-/pytorch_lightning/metrics/*  @teddykoker @ananyahjha93 @justusschock
-/tests/metrics/*              @teddykoker @ananyahjha93 @justusschock
+/pytorch_lightning/metrics/   @teddykoker @ananyahjha93 @justusschock
+/tests/metrics/               @teddykoker @ananyahjha93 @justusschock
 /docs/source/metrics.rst      @teddykoker @ananyahjha93 @justusschock
 
 # API
-/pytorch_lightning/callbacks/base.py  @williamfalcon
-/pytorch_lightning/core/datamodule.py @williamfalcon
-/pytorch_lightning/trainer/trainer.py @williamfalcon
-/pytorch_lightning/core/hooks.py     @williamfalcon
-/pytorch_lightning/core/lightning.py  @williamfalcon
+/pytorch_lightning/callbacks/base.py           @williamfalcon
+/pytorch_lightning/core/datamodule.py          @williamfalcon
+/pytorch_lightning/trainer/trainer.py          @williamfalcon @tchaton
+/pytorch_lightning/core/hooks.py               @williamfalcon
+/pytorch_lightning/core/lightning.py           @williamfalcon @tchaton
+/pytorch_lightning/core/optimizer.py           @tchaton
+/pytorch_lightning/trainer/training_loop.py    @tchaton @SeanNaren
+/pytorch_lightning/trainer/evaluation_loop.py  @tchaton @SeanNaren
 
+# Connectors
+/pytorch_lightning/trainer/connectors/         @tchaton @SeanNaren
 
 # accelerators
-/pytorch_lightning/accelerators/*  @williamfalcon
+/pytorch_lightning/accelerators/               @williamfalcon @tchaton @SeanNaren @awaelchli @justusschock
 
 # owners
-/pytorch_lightning/.github/CODEOWNERS @williamfalcon
+/.github/CODEOWNERS   @williamfalcon
+# main
+/README.md            @williamfalcon @edenlightning
+# installation
+/setup.py             @borda @williamfalcon
+
+# CI/CD
+/.github/workflows/   @borda @tchaton
+/.github/*.py         @borda @tchaton
+/dockers/             @borda @tchaton
+# configs in root
+/*.yml                @borda @tchaton
+
+# Docs
+/docs/                          @edenlightning @tchaton @borda @awaelchli
+/.github/*.md                   @edenlightning @williamfalcon @borda
+/.github/ISSUE_TEMPLATE/*.md    @edenlightning @borda @tchaton
+/docs/source/conf.py            @borda @awaelchli