diff --git a/boards/m5stack/m5stack_cores3/doc/index.rst b/boards/m5stack/m5stack_cores3/doc/index.rst
index f1b1290d16c..4ee0d8461b6 100644
--- a/boards/m5stack/m5stack_cores3/doc/index.rst
+++ b/boards/m5stack/m5stack_cores3/doc/index.rst
@@ -1,7 +1,4 @@
-.. _m5stack_cores3:
-
-M5Stack CoreS3
-##############
+.. zephyr:board:: m5stack_cores3
 
 Overview
 ********
@@ -27,13 +24,6 @@ M5Stack CoreS3 features consist of:
 - PMIC AXP2101
 - Battery 500mAh 3.7 V
 
-.. figure:: img/m5stack_cores3.webp
-        :align: center
-        :alt: M5Stack-CoreS3
-        :width: 400 px
-
-        M5Stack CoreS3 module
-
 Start Application Development
 *****************************
 
@@ -99,19 +89,18 @@ message in the monitor:
 Debugging
 ---------
 
-ESP32-S3 support on OpenOCD is available upstream as of version 0.12.0.
-Download and install OpenOCD from `OpenOCD`_.
+ESP32-S3 support on OpenOCD is available at `OpenOCD ESP32`_.
 
 ESP32-S3 has a built-in JTAG circuitry and can be debugged without any additional chip. Only an USB cable connected to the D+/D- pins is necessary.
 
 Further documentation can be obtained from the SoC vendor in `JTAG debugging for ESP32-S3`_.
 
-.. _`OpenOCD`: https://github.com/openocd-org/openocd
+References
+**********
+
+.. target-notes::
+
+.. _`M5Stack CoreS3 Documentation`: http://docs.m5stack.com/en/core/CoreS3
+.. _`M5Stack CoreS3 Schematic`: https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/K128%20CoreS3/Sch_M5_CoreS3_v1.0.pdf
+.. _`OpenOCD ESP32`: https://github.com/espressif/openocd-esp32/releases
 .. _`JTAG debugging for ESP32-S3`: https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/api-guides/jtag-debugging/
-
-
-Related Documents
-*****************
-
-- `M5Stack CoreS3 official docs <http://docs.m5stack.com/en/core/CoreS3>`_
-- `M5Stack CoreS3 schematic <https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/docs/datasheet/core/K128%20CoreS3/Sch_M5_CoreS3_v1.0.pdf>`_ (PDF)