diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 086f9e6b09e49..a6ffc9b82b498 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -30,30 +30,29 @@
 # Packages
 /src/pytorch_lightning                      @borda @awaelchli @carmocca @justusschock @rohitgr7 @otaj
 /src/pytorch_lightning/accelerators         @williamfalcon @tchaton @SeanNaren @awaelchli @justusschock @kaushikb11
-/src/pytorch_lightning/callbacks            @williamfalcon @tchaton @carmocca @borda @kaushikb11
+/src/pytorch_lightning/callbacks            @williamfalcon @tchaton @carmocca @kaushikb11
 /src/pytorch_lightning/core                 @tchaton @borda @carmocca @justusschock @kaushikb11
 /src/pytorch_lightning/distributed          @williamfalcon @tchaton @awaelchli @kaushikb11
 /src/pytorch_lightning/lite                 @tchaton @awaelchli @carmocca
 /src/pytorch_lightning/loggers              @tchaton @awaelchli @borda
-/src/pytorch_lightning/loggers/wandb.py     @borisdayma @borda
+/src/pytorch_lightning/loggers/wandb.py     @borisdayma @otaj @rohitgr7
 /src/pytorch_lightning/loggers/neptune.py   @shnela @HubertJaworski @pkasprzyk @pitercl @Raalsky @aniezurawski @kamil-kaczmarek
 /src/pytorch_lightning/loops                @tchaton @awaelchli @justusschock @carmocca
-/src/pytorch_lightning/overrides            @tchaton @borda
 /src/pytorch_lightning/plugins              @tchaton @awaelchli @justusschock
 /src/pytorch_lightning/profilers            @williamfalcon @tchaton @borda @carmocca
-/src/pytorch_lightning/profilers/pytorch.py @nbcsm @guotuofeng
+/src/pytorch_lightning/profilers/pytorch.py @nbcsm @guotuofeng @carmocca
 /src/pytorch_lightning/strategies           @tchaton @SeanNaren @awaelchli @justusschock @kaushikb11
 /src/pytorch_lightning/trainer              @williamfalcon @borda @tchaton @carmocca @awaelchli @justusschock @kaushikb11
-/src/pytorch_lightning/trainer/connectors   @tchaton @carmocca @borda
+/src/pytorch_lightning/trainer/connectors   @tchaton @carmocca @awaelchli
 /src/pytorch_lightning/tuner                @SkafteNicki @borda @awaelchli
 /src/pytorch_lightning/utilities            @borda @tchaton @carmocca
 
-/src/lightning_app                          @tchaton @manskx
-/src/lightning_app/cli/pl-app-template      @tchaton @awaelchli @Borda
+/src/lightning_app                          @tchaton @manskx @lantiga
+/src/lightning_app/cli/pl-app-template      @tchaton @awaelchli @lantiga
 /src/lightning_app/core                     @tchaton @awaelchli @manskx
 /src/lightning_app/core/queues.py           @tchaton @hhsecond @manskx
-/src/lightning_app/runners/cloud.py         @tchaton @hhsecond
-/src/lightning_app/testing                  @tchaton @manskx
+/src/lightning_app/runners/cloud.py         @tchaton @hhsecond @lantiga
+/src/lightning_app/testing                  @tchaton @manskx @lantiga
 /src/lightning_app/__about__.py             @nohalon @edenlightning @lantiga
 
 /src/lightning_lite                         @awaelchli @carmocca @justusschock
@@ -68,18 +67,18 @@
 # Lite tests
 /tests/tests_lite                           @awaelchli @carmocca @justusschock
 
-# Specifics
-/src/pytorch_lightning/trainer/connectors/logger_connector @tchaton @carmocca
-/src/pytorch_lightning/trainer/progress.py                 @tchaton @awaelchli @carmocca
 # API
 /src/pytorch_lightning/callbacks/callback.py @williamfalcon @awaelchli @ananthsub @carmocca
 /src/pytorch_lightning/core/datamodule.py    @williamFalcon @awaelchli @ananthsub @carmocca
-/src/pytorch_lightning/trainer/trainer.py    @williamfalcon @tchaton @awaelchli
-/src/pytorch_lightning/core/hooks.py         @williamfalcon @tchaton @awaelchli @ananthsub @carmocca
-/src/pytorch_lightning/core/module.py        @williamfalcon @tchaton @awaelchli
+/src/pytorch_lightning/trainer/trainer.py    @williamfalcon @tchaton @awaelchli @carmocca
+/src/pytorch_lightning/core/hooks.py         @williamfalcon @tchaton @awaelchli @carmocca
+/src/pytorch_lightning/core/module.py        @williamfalcon @tchaton @awaelchli @carmocca
 
 /.github/CODEOWNERS                  @williamfalcon
 /SECURITY.md                         @williamfalcon
 /README.md                           @williamfalcon @edenlightning @borda
 /setup.py                            @williamfalcon @borda @carmocca
 /src/pytorch_lightning/__about__.py  @williamfalcon @borda @carmocca
+/src/lightning_app/__about__.py      @williamfalcon @borda @manskx
+/src/lightning_lite/__about__.py     @williamfalcon @borda @awaelchli
+/src/*/__setup__.py                  @borda @manskx