diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 915429d7de8..c08c92ba69a 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -1425,12 +1425,18 @@ Espressif Platforms:
     status: maintained
     maintainers:
         - sylvioalves
+        - glaubermaroto
+        - ulipe
     files:
         - drivers/*/*esp32*
-        - boards/xtensa/esp32/
-        - soc/xtensa/esp32/
+        - boards/xtensa/esp32*/
+        - soc/xtensa/esp32*/
+        - boards/riscv/esp32*/
+        - soc/riscv/esp32*/
         - dts/xtensa/espressif/
+        - dts/riscv/espressif/
         - dts/bindings/*/*esp32*
+        - samples/boards/esp32*
     labels:
         - "platform: ESP32"