diff --git a/CODEOWNERS b/CODEOWNERS
index d7782d1ff2081..cd88dca82f46d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -76,6 +76,7 @@
 /boards/nios2/altera_max10/               @ramakrishnapallala
 /boards/posix/                            @aescolar
 /boards/riscv32/                          @kgugala @pgielda @nategraff-sifive
+/boards/shields/                          @erwango
 /boards/x86/                              @andrewboie @nashif
 /boards/x86/arduino_101/                  @nashif
 /boards/x86/galileo/                      @nashif