diff --git a/CODEOWNERS b/CODEOWNERS
index b9f8e8b56..4a09f69c3 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,9 +1,10 @@
-boot/boot_serial @nordicjm @de-nordic
-boot/bootutil @davidvincze
-boot/cypress @romanjoe
-boot/espressif @almir-okato
-boot/mynewt @kasjer
-boot/nuttx @michallenc
-boot/zcbor @nordicjm @de-nordic
-boot/zephyr @nordicjm @de-nordic
+boot/boot_serial/ @nordicjm @de-nordic
+boot/bootutil/ @davidvincze
+boot/cypress/ @romanjoe
+boot/espressif/ @almir-okato
+boot/mynewt/ @kasjer
+boot/nuttx/ @michallenc
+boot/zcbor/ @nordicjm @de-nordic
+boot/zephyr/ @nordicjm @de-nordic
+zephyr/ @nordicjm @de-nordic
 * @d3zd3z