diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 5d2e91df8f429d..b49611befdbe4c 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -1644,12 +1644,13 @@ Kernel:
   status: maintained
   maintainers:
     - andyross
+    - peter-mitsis
   collaborators:
     - nashif
     - ceolin
     - dcpleung
-    - peter-mitsis
     - cfriedt
+    - npitre
   files:
     - doc/kernel/
     - include/zephyr/kernel*.h
@@ -1668,9 +1669,10 @@ Base OS:
   status: maintained
   maintainers:
     - andyross
+    - nashif
   collaborators:
     - dcpleung
-    - nashif
+    - peter-mitsis
   files:
     - include/zephyr/sys/
     - lib/os/