diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/Kconfig.defconfig b/boards/wemos/esp32s2_lolin_mini/Kconfig.defconfig
similarity index 74%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/Kconfig.defconfig
rename to boards/wemos/esp32s2_lolin_mini/Kconfig.defconfig
index 709b0d5b53b..85fdb266956 100644
--- a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/Kconfig.defconfig
+++ b/boards/wemos/esp32s2_lolin_mini/Kconfig.defconfig
@@ -3,10 +3,6 @@
 # Copyright (c) 2023 Google, LLC
 # SPDX-License-Identifier: Apache-2.0
 
-config BOARD
-	default "esp32s2_lolin_mini"
-	depends on BOARD_ESP32S2_LOLIN_MINI
-
 config ENTROPY_GENERATOR
 	default y
 
diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/Kconfig.board b/boards/wemos/esp32s2_lolin_mini/Kconfig.esp32s2_lolin_mini
similarity index 54%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/Kconfig.board
rename to boards/wemos/esp32s2_lolin_mini/Kconfig.esp32s2_lolin_mini
index 1f567f3f42b..fe7f72a138b 100644
--- a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/Kconfig.board
+++ b/boards/wemos/esp32s2_lolin_mini/Kconfig.esp32s2_lolin_mini
@@ -4,9 +4,4 @@
 # SPDX-License-Identifier: Apache-2.0
 
 config BOARD_ESP32S2_LOLIN_MINI
-	bool "ESP32S2 Lolin Mini Board"
-	depends on SOC_SERIES_ESP32S2
-
-choice SOC_PART_NUMBER
-	default SOC_ESP32S2_FN4R2
-endchoice
+	select SOC_ESP32S2_FN4R2
diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/board.cmake b/boards/wemos/esp32s2_lolin_mini/board.cmake
similarity index 100%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/board.cmake
rename to boards/wemos/esp32s2_lolin_mini/board.cmake
diff --git a/boards/wemos/esp32s2_lolin_mini/board.yml b/boards/wemos/esp32s2_lolin_mini/board.yml
new file mode 100644
index 00000000000..7df1267c214
--- /dev/null
+++ b/boards/wemos/esp32s2_lolin_mini/board.yml
@@ -0,0 +1,5 @@
+board:
+  name: esp32s2_lolin_mini
+  vendor: wemos
+  socs:
+  - name: esp32s2
diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/doc/img/esp32_s2_lolin_mini.jpg b/boards/wemos/esp32s2_lolin_mini/doc/img/esp32_s2_lolin_mini.jpg
similarity index 100%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/doc/img/esp32_s2_lolin_mini.jpg
rename to boards/wemos/esp32s2_lolin_mini/doc/img/esp32_s2_lolin_mini.jpg
diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/doc/index.rst b/boards/wemos/esp32s2_lolin_mini/doc/index.rst
similarity index 100%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/doc/index.rst
rename to boards/wemos/esp32s2_lolin_mini/doc/index.rst
diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini-pinctrl.dtsi b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini-pinctrl.dtsi
similarity index 100%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini-pinctrl.dtsi
rename to boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini-pinctrl.dtsi
diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini.dts b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.dts
similarity index 98%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini.dts
rename to boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.dts
index 3ce00f8bdb8..53a598ad0de 100644
--- a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini.dts
+++ b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.dts
@@ -11,7 +11,7 @@
 #include "esp32s2_lolin_mini-pinctrl.dtsi"
 
 / {
-	model = "esp32s2_lolin_mini";
+	model = "Wemos ESP32S2-Lolin Mini";
 	compatible = "espressif,esp32s2";
 
 	aliases {
diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini.yaml b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.yaml
similarity index 93%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini.yaml
rename to boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.yaml
index 3764f5eddd7..763b8c838f4 100644
--- a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini.yaml
+++ b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini.yaml
@@ -12,3 +12,4 @@ testing:
   ignore_tags:
     - net
     - bluetooth
+vendor: wemos
diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini_defconfig b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini_defconfig
similarity index 68%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini_defconfig
rename to boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini_defconfig
index c8c04460dbe..f029cac9e9e 100644
--- a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/esp32s2_lolin_mini_defconfig
+++ b/boards/wemos/esp32s2_lolin_mini/esp32s2_lolin_mini_defconfig
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
 
-CONFIG_BOARD_ESP32S2_LOLIN_MINI=y
-CONFIG_SOC_SERIES_ESP32S2=y
-
 CONFIG_MAIN_STACK_SIZE=2048
 
 CONFIG_CONSOLE=y
diff --git a/boards/boards_legacy/xtensa/esp32s2_lolin_mini/support/openocd.cfg b/boards/wemos/esp32s2_lolin_mini/support/openocd.cfg
similarity index 100%
rename from boards/boards_legacy/xtensa/esp32s2_lolin_mini/support/openocd.cfg
rename to boards/wemos/esp32s2_lolin_mini/support/openocd.cfg
diff --git a/boards/wemos/index.rst b/boards/wemos/index.rst
new file mode 100644
index 00000000000..200fbcae8a7
--- /dev/null
+++ b/boards/wemos/index.rst
@@ -0,0 +1,10 @@
+.. _boards-wemos:
+
+Wemos
+#####
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*