diff --git a/CODEOWNERS b/CODEOWNERS
index be14d8b6ce06..977b689b5adf 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -136,8 +136,8 @@ Kconfig*                                  @tejlmand
 /lib/date_time/                           @trantanen @tokangas
 /lib/hw_id/                               @nrfconnect/ncs-cia
 /lib/wave_gen/                            @MarekPieta
-/lib/hw_unique_key/                       @frkv @Vge0rge @vili-nordic @mswarowsky
-/lib/identity_key/                        @frkv @Vge0rge @vili-nordic @mswarowsky
+/lib/hw_unique_key/                       @frkv @Vge0rge @vili-nordic
+/lib/identity_key/                        @frkv @Vge0rge @vili-nordic
 /lib/modem_jwt/                           @jayteemo @SeppoTakalo
 /lib/modem_slm/                           @SeppoTakalo @MarkusLassila @tomi-font
 /lib/modem_attest_token/                  @jayteemo
@@ -152,7 +152,7 @@ Kconfig*                                  @tejlmand
 /modules/hostap/                          @krish2718 @jukkar @rado17 @sachinthegreen @rlubos
 /modules/mcuboot/                         @de-nordic @nordicjm
 /modules/cjson/                           @nrfconnect/ncs-cia @plskeggs @sigvartmh
-/modules/trusted-firmware-m/              @frkv @Vge0rge @vili-nordic @mswarowsky
+/modules/trusted-firmware-m/              @frkv @Vge0rge @vili-nordic
 /modules/coremark/                        @zycz
 /samples/                                 @nrfconnect/ncs-test-leads
 /samples/net/                             @nrfconnect/ncs-cia @lemrey
@@ -165,7 +165,7 @@ Kconfig*                                  @tejlmand
 /samples/bluetooth/fast_pair/             @alstrzebonski @MarekPieta @kapi-no
 /samples/bootloader/                      @hakonfam @oyvindronningstad
 /samples/matter/                          @nrfconnect/ncs-matter
-/samples/crypto/                          @frkv @Vge0rge @vili-nordic @mswarowsky
+/samples/crypto/                          @frkv @Vge0rge @vili-nordic
 /samples/debug/memfault/                  @nrfconnect/ncs-cia
 /samples/debug/ppi_trace/                 @nordic-krch @anangl
 /samples/hw_id/                           @nrfconnect/ncs-cia
@@ -174,7 +174,7 @@ Kconfig*                                  @tejlmand
 /samples/app_event_manager/               @pdunaj @MarekPieta
 /samples/event_manager_proxy/             @rakons
 /samples/gazell/                          @leewkb4567
-/samples/keys/                            @frkv @Vge0rge @vili-nordic @mswarowsky
+/samples/keys/                            @frkv @Vge0rge @vili-nordic
 /samples/mpsl/                            @nrfconnect/ncs-dragoon
 /samples/nfc/                             @grochu
 /samples/nrf_rpc/                         @doki-nordic @KAGA164
@@ -196,7 +196,7 @@ Kconfig*                                  @tejlmand
 /samples/peripheral/lpuart/               @nordic-krch
 /samples/peripheral/802154_phy_test/      @ankuns @piotrkoziar
 /samples/peripheral/802154_sniffer/       @e-rk
-/samples/tfm/                             @frkv @Vge0rge @vili-nordic @mswarowsky
+/samples/tfm/                             @frkv @Vge0rge @vili-nordic
 /samples/zigbee/                          @milewr
 /samples/CMakeLists.txt                   @tejlmand
 /samples/nrf5340/netboot/                 @hakonfam
@@ -288,8 +288,8 @@ Kconfig*                                  @tejlmand
 /subsys/sdfw_services/                    @anhmolt @hakonfam @jonathannilsen
 /subsys/sdfw_services/services/extmem/    @e-rk @tomchy
 /subsys/suit/                             @tomchy @ahasztag
-/subsys/nrf_security/                     @frkv @Vge0rge @vili-nordic @mswarowsky
-/subsys/trusted_storage/                  @frkv @Vge0rge @vili-nordic @mswarowsky
+/subsys/nrf_security/                     @frkv @Vge0rge @vili-nordic
+/subsys/trusted_storage/                  @frkv @Vge0rge @vili-nordic
 /subsys/uart_async_adapter/               @rakons
 /subsys/net_core_monitor/                 @maje-emb
 /subsys/zigbee/                           @milewr
@@ -309,7 +309,7 @@ Kconfig*                                  @tejlmand
 /tests/lib/edge_impulse/                  @pdunaj @MarekPieta
 /tests/lib/nrf_fuel_gauge/                @nordic-auko @aasinclair
 /tests/lib/gcf_sms/                       @eivindj-nordic
-/tests/lib/hw_unique_key*/                @frkv @Vge0rge @vili-nordic @mswarowsky
+/tests/lib/hw_unique_key*/                @frkv @Vge0rge @vili-nordic
 /tests/lib/hw_id/                         @nrfconnect/ncs-cia
 /tests/lib/location/                      @trantanen @tokangas
 /tests/lib/lte_lc/                        @trantanen @tokangas
@@ -363,6 +363,6 @@ Kconfig*                                  @tejlmand
 /tests/subsys/sdfw_services/              @anhmolt @hakonfam @jonathannilsen
 /tests/subsys/zigbee/                     @milewr
 /tests/subsys/suit/                       @tomchy @ahasztag @robertstypa
-/tests/tfm/                               @frkv @Vge0rge @vili-nordic @mswarowsky @stephen-nordic @magnev
+/tests/tfm/                               @frkv @Vge0rge @vili-nordic @stephen-nordic @magnev
 /tests/unity/                             @nordic-krch
 /zephyr/                                  @carlescufi