diff --git a/boards/m5stack/m5stack_atom_lite/doc/index.rst b/boards/m5stack/m5stack_atom_lite/doc/index.rst
index 6a47c4a7f32..87e56a23677 100644
--- a/boards/m5stack/m5stack_atom_lite/doc/index.rst
+++ b/boards/m5stack/m5stack_atom_lite/doc/index.rst
@@ -1,7 +1,4 @@
-.. _m5stack_atom_lite:
-
-M5Stack ATOM Lite
-#################
+.. zephyr:board:: m5stack_atom_lite
 
 Overview
 ********
@@ -16,14 +13,6 @@ It features the following integrated components:
 - Infrared LED
 - 1x Grove extension port
 
-
-.. figure:: img/m5stack_atom_lite.webp
-        :align: center
-        :alt: M5Stack ATOM Lite
-
-        M5Stack ATOM Lite
-
-
 Supported Features
 ==================
 
diff --git a/boards/m5stack/m5stack_atoms3/doc/index.rst b/boards/m5stack/m5stack_atoms3/doc/index.rst
index 69bff1ee0cf..1b863cb08be 100644
--- a/boards/m5stack/m5stack_atoms3/doc/index.rst
+++ b/boards/m5stack/m5stack_atoms3/doc/index.rst
@@ -1,7 +1,4 @@
-.. _m5stack_atoms3:
-
-M5Stack AtomS3
-##############
+.. zephyr:board:: m5stack_atoms3
 
 Overview
 ********
@@ -18,14 +15,6 @@ It features the following integrated components:
 - 6-axis IMU MPU6886
 - Infrared emitter
 
-
-.. figure:: img/m5stack_atoms3.webp
-        :align: center
-        :alt: M5Stack AtomS3
-
-        M5Stack AtomS3
-
-
 Supported Features
 ==================
 
diff --git a/boards/m5stack/m5stack_atoms3_lite/doc/index.rst b/boards/m5stack/m5stack_atoms3_lite/doc/index.rst
index ffbe8f1cb05..23af62d96e6 100644
--- a/boards/m5stack/m5stack_atoms3_lite/doc/index.rst
+++ b/boards/m5stack/m5stack_atoms3_lite/doc/index.rst
@@ -1,7 +1,4 @@
-.. _m5stack_atoms3_lite:
-
-M5Stack AtomS3 Lite
-###################
+.. zephyr:board:: m5stack_atoms3_lite
 
 Overview
 ********
@@ -16,14 +13,6 @@ It features the following integrated components:
 - 8MB of Flash
 - RGB Status-LED
 
-
-.. figure:: img/m5stack_atoms3_lite.webp
-        :align: center
-        :alt: M5Stack AtomS3 Lite
-
-        M5Stack AtomS3 Lite
-
-
 Supported Features
 ==================
 
diff --git a/boards/m5stack/m5stack_core2/doc/index.rst b/boards/m5stack/m5stack_core2/doc/index.rst
index 02ba5fa7249..9855ef1de59 100644
--- a/boards/m5stack/m5stack_core2/doc/index.rst
+++ b/boards/m5stack/m5stack_core2/doc/index.rst
@@ -1,7 +1,4 @@
-.. _m5stack_core2:
-
-M5Stack Core2
-#############
+.. zephyr:board:: m5stack_core2
 
 Overview
 ********
@@ -26,13 +23,6 @@ M5Stack Core2 features the following integrated components:
 - MIC SPM1423
 - Battery 390mAh 3,7V
 
-.. figure:: img/m5stack_core2.webp
-        :align: center
-        :alt: M5Stack-Core2
-        :width: 400 px
-
-        M5Stack-Core2 module
-
 Functional Description
 **********************
 
diff --git a/boards/m5stack/m5stack_stamps3/doc/index.rst b/boards/m5stack/m5stack_stamps3/doc/index.rst
index 36881121e8a..3762fd49b1c 100644
--- a/boards/m5stack/m5stack_stamps3/doc/index.rst
+++ b/boards/m5stack/m5stack_stamps3/doc/index.rst
@@ -1,7 +1,4 @@
-.. _m5stack_stamps3:
-
-M5Stack StampS3
-###############
+.. zephyr:board:: m5stack_stamps3
 
 Overview
 ********
@@ -17,13 +14,6 @@ It features the following integrated components:
 - Bluetooth
 - User-Button
 
-.. figure:: img/m5stack_stamps3.webp
-        :align: center
-        :alt: M5Stack StampS3
-        :width: 400 px
-
-        M5Stack StampS3 module
-
 Functional Description
 **********************
 
diff --git a/boards/m5stack/m5stickc_plus/doc/index.rst b/boards/m5stack/m5stickc_plus/doc/index.rst
index 4fe431fea84..f40e21fbd5e 100644
--- a/boards/m5stack/m5stickc_plus/doc/index.rst
+++ b/boards/m5stack/m5stickc_plus/doc/index.rst
@@ -1,7 +1,4 @@
-.. _m5stickc_plus:
-
-M5StickC PLUS
-#############
+.. zephyr:board:: m5stickc_plus
 
 Overview
 ********
diff --git a/boards/m5stack/stamp_c3/doc/index.rst b/boards/m5stack/stamp_c3/doc/index.rst
index 40869ee0166..a953b595b2c 100644
--- a/boards/m5stack/stamp_c3/doc/index.rst
+++ b/boards/m5stack/stamp_c3/doc/index.rst
@@ -1,7 +1,4 @@
-.. _stamp_c3:
-
-M5Stack STAMP-C3
-##################
+.. zephyr:board:: stamp_c3
 
 Overview
 ********
diff --git a/doc/releases/release-notes-3.7.rst b/doc/releases/release-notes-3.7.rst
index d567fe702be..b93a07d194e 100644
--- a/doc/releases/release-notes-3.7.rst
+++ b/doc/releases/release-notes-3.7.rst
@@ -436,7 +436,7 @@ Boards & SoC Support
   * Added support for :zephyr:board:`Espressif ESP32-S3 DevKit-C <esp32s3_devkitc>`: ``esp32s3_devkitc``.
   * Added support for :zephyr:board:`Espressif ESP32-C6 DevKit-C <esp32c6_devkitc>`: ``esp32c6_devkitc``.
   * Added support for :ref:`Waveshare ESP32-S3-Touch-LCD-1.28 <esp32s3_touch_lcd_1_28>`: ``esp32s3_touch_lcd_1_28``.
-  * Added support for :ref:`M5Stack ATOM Lite <m5stack_atom_lite>`: ``m5stack_atom_lite``.
+  * Added support for :zephyr:board:`M5Stack ATOM Lite <m5stack_atom_lite>`: ``m5stack_atom_lite``.
   * Added support for :ref:`CTHINGS.CO Connectivity Card nRF52840 <ctcc_nrf52840>`: ``ctcc_nrf52840``.
 
 * Made these board changes: