diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ee837d410ed..acc2404dcb7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,17 +5,17 @@
 
 # Note: last match wins
 
-# By Default reviews go to the infrastructure community, to address missing lines in this document.
-*                                     @AlexanderLanin @dcalavrezo-qorix @MaximilianSoerenPollak
+# By Default reviews go to the infrastructure community and tech leads, to address missing lines in this document.
+*                                     @AlexanderLanin @dcalavrezo-qorix @MaximilianSoerenPollak @nradakovic @antonkri @FScholPer @qor-lb @johannes-esr @anmittag
 
-# All special files go to infrastructure as well
-.*                                    @AlexanderLanin @dcalavrezo-qorix @MaximilianSoerenPollak
+# All special files go to infrastructure
+.*                                    @AlexanderLanin @dcalavrezo-qorix @MaximilianSoerenPollak @nradakovic @FScholPer
 
 .github/ISSUE_TEMPLATE/               @pahmann @masc2023 @aschemmel-tech @PandaeDo
 .github/CODEOWNERS                    @antonkri @FScholPer @qor-lb @johannes-esr @anmittag
 
 /docs/                                @pahmann @masc2023 @aschemmel-tech @PandaeDo
-/docs/conf.py                         @AlexanderLanin @dcalavrezo-qorix @MaximilianSoerenPollak
+/docs/conf.py                         @AlexanderLanin @dcalavrezo-qorix @MaximilianSoerenPollak @a-zw
 /docs/contribute/                     @eclipse-score/automotive-score-committers
 # all architecture community members incl. FT leads
 /docs/features/                       @qor-lb @arsibo @ramceb @FScholPer @4og @LittleHuba @michaelsaborov @rmaddikery @pawelrutkaq @umaucher @sunildevda @lavrovvalera  @anmittag