diff --git a/boards/others/black_f407ve/doc/index.rst b/boards/others/black_f407ve/doc/index.rst
index cffdd4d41be..f6f088b3998 100644
--- a/boards/others/black_f407ve/doc/index.rst
+++ b/boards/others/black_f407ve/doc/index.rst
@@ -1,7 +1,4 @@
-.. _black_f407ve_board:
-
-Black STM32 F407VE Development Board
-####################################
+.. zephyr:board:: black_f407ve
 
 Overview
 ********
@@ -27,10 +24,6 @@ Here are some highlights of the BLACK_F407VE board:
 - Four push-buttons: RESET, K0, K1 and WK_UP
 - Mini-AB connector
 
-.. image:: img/black_f407ve.jpg
-     :align: center
-     :alt: BLACK_F407VE
-
 See also board descriptions at `STM32-base website`_,
 `STM32F407VET6 black board`_ and `MCUDev Black STM32F407VET6`_
 
diff --git a/boards/others/black_f407zg_pro/doc/index.rst b/boards/others/black_f407zg_pro/doc/index.rst
index 4857e8bb8da..ec7e6313c10 100644
--- a/boards/others/black_f407zg_pro/doc/index.rst
+++ b/boards/others/black_f407zg_pro/doc/index.rst
@@ -1,7 +1,4 @@
-.. _black_f407zg_pro_board:
-
-Black STM32 F407ZG Pro Development Board
-########################################
+.. zephyr:board:: black_f407zg_pro
 
 Overview
 ********
@@ -27,10 +24,6 @@ Here are some highlights of the BLACK_F407ZG_PRO board:
 - Four push-buttons: RESET, K0, K1 and WK_UP
 - Mini-AB connector
 
-.. image:: img/black_f407zg_pro.jpg
-     :align: center
-     :alt: BLACK_F407ZG_PRO
-
 .. warning:: The +5V pins on this board are directly connected to the +5V pin
 	     of the USB connector. There is no protection in place. Do not
 	     power this board through USB and an external power supply at
diff --git a/boards/others/icev_wireless/doc/index.rst b/boards/others/icev_wireless/doc/index.rst
index c699686caf3..91c4ee1ff98 100644
--- a/boards/others/icev_wireless/doc/index.rst
+++ b/boards/others/icev_wireless/doc/index.rst
@@ -1,7 +1,4 @@
-.. _icev_wireless:
-
-ICE-V Wireless
-##############
+.. zephyr:board:: icev_wireless
 
 Overview
 ********
@@ -10,12 +7,6 @@ The ICE-V Wireless is a combined ESP32C3 and iCE40 FPGA board.
 
 See the `ICE-V Wireless Github Project`_ for details.
 
-.. figure:: img/icev_wireless.jpg
-   :align: center
-   :alt: ICE-V Wireless
-
-   ICE-V Wireless
-
 Hardware
 ********
 
diff --git a/boards/others/neorv32/doc/index.rst b/boards/others/neorv32/doc/index.rst
index a2dedba0a76..066377bbf25 100644
--- a/boards/others/neorv32/doc/index.rst
+++ b/boards/others/neorv32/doc/index.rst
@@ -1,7 +1,4 @@
-.. _neorv32:
-
-NEORV32
-#######
+.. zephyr:board:: neorv32
 
 Overview
 ********
diff --git a/boards/others/serpente/doc/index.rst b/boards/others/serpente/doc/index.rst
index e7140707d74..0894427ff3e 100644
--- a/boards/others/serpente/doc/index.rst
+++ b/boards/others/serpente/doc/index.rst
@@ -1,7 +1,4 @@
-.. _serpente:
-
-Arturo182 Serpente
-##################
+.. zephyr:board:: serpente
 
 Overview
 ********
@@ -11,10 +8,6 @@ board equipped with 4MiB flash storage, a PWM enabled RGB led and 6 I/O pins.
 The board comes with 3 different USB connector options: USB Type-C plug,
 USB Type-C socket and USB Type-A plug.
 
-.. image:: img/serpente.jpg
-     :align: center
-     :alt: Serpente Boards
-
 Hardware
 ********
 
diff --git a/boards/others/stm32_min_dev/doc/index.rst b/boards/others/stm32_min_dev/doc/index.rst
index e27ea5c59f5..29d5a75b27e 100644
--- a/boards/others/stm32_min_dev/doc/index.rst
+++ b/boards/others/stm32_min_dev/doc/index.rst
@@ -1,7 +1,4 @@
-.. _stm32_min_dev:
-
-STM32 Minimum Development Board
-###############################
+.. zephyr:board:: stm32_min_dev
 
 Overview
 ********
@@ -16,12 +13,6 @@ are two variants of the board:
 Zephyr applications can use the stm32_min_dev@blue or stm32_min_dev@black board
 configuration to use these boards.
 
-.. figure:: img/stm32_min_dev.jpg
-     :align: center
-     :alt: STM32 Minimum Development Board
-
-     STM32 Minimum Development Board
-
 As the name suggests, these boards have the bare minimum components required to
 power on the CPU. For practical use, you'll need to add additional components
 and circuits using a breadboard, for example.
diff --git a/boards/others/stm32f030_demo/doc/index.rst b/boards/others/stm32f030_demo/doc/index.rst
index 8080f2b33d9..84d619b38b0 100644
--- a/boards/others/stm32f030_demo/doc/index.rst
+++ b/boards/others/stm32f030_demo/doc/index.rst
@@ -1,7 +1,4 @@
-.. _stm32f030_demo:
-
-STM32F030 DEMO BOARD
-####################
+.. zephyr:board:: stm32f030_demo
 
 This board has the bare minimum components required to power on
 the STM32F030F4P6 MCU. Most of the GPIOs on the STM32 SoC have
@@ -11,10 +8,6 @@ that match the SoC's pin names.
 For practical use, you'll need to add additional components
 and circuits using a breadboard, for example.
 
-.. image:: img/stm32f030_demo.jpg
-   :align: center
-   :alt: STM32F030 DEMO BOARD
-
 More information about the board can be found at the `stm32-base.org website`_.
 
 More information about STM32F030F4P6 can be found here:
diff --git a/boards/others/stm32f103_mini/doc/index.rst b/boards/others/stm32f103_mini/doc/index.rst
index c6938020f99..c19ded8a82f 100644
--- a/boards/others/stm32f103_mini/doc/index.rst
+++ b/boards/others/stm32f103_mini/doc/index.rst
@@ -1,7 +1,4 @@
-.. _stm32f103_mini_board:
-
-STM32F103 Mini
-################
+.. zephyr:board:: stm32f103_mini
 
 Overview
 ********
diff --git a/boards/others/stm32f401_mini/doc/index.rst b/boards/others/stm32f401_mini/doc/index.rst
index b24538f3137..5cfa267f712 100644
--- a/boards/others/stm32f401_mini/doc/index.rst
+++ b/boards/others/stm32f401_mini/doc/index.rst
@@ -1,7 +1,4 @@
-.. _stm32f401_mini:
-
-STM32 Mini F401
-###############
+.. zephyr:board:: stm32f401_mini
 
 Overview
 ********
@@ -10,10 +7,6 @@ The STM32 Mini F401 is an extremely low cost and bare-bones
 development board featuring the STM32F401CC, see `STM32F401CC website`_.
 More info about the board with schematics available `here <stm32-base-board-page_>`_
 
-.. image:: img/STM32_Mini_F401-1.jpg
-      :align: center
-      :alt: STM32 Mini F401
-
 Hardware
 ********