diff --git a/boards/beagle/beaglebone_ai64/board.yml b/boards/beagle/beaglebone_ai64/board.yml
index f16d9a2d248..e81db526dd5 100644
--- a/boards/beagle/beaglebone_ai64/board.yml
+++ b/boards/beagle/beaglebone_ai64/board.yml
@@ -1,5 +1,6 @@
 board:
   name: beaglebone_ai64
+  full_name: BeagleBone AI-64
   vendor: beagle
   socs:
   - name: j721e
diff --git a/boards/beagle/beaglebone_ai64/doc/assets/bbai_64.webp b/boards/beagle/beaglebone_ai64/doc/assets/beaglebone_ai_64.webp
similarity index 100%
rename from boards/beagle/beaglebone_ai64/doc/assets/bbai_64.webp
rename to boards/beagle/beaglebone_ai64/doc/assets/beaglebone_ai_64.webp
diff --git a/boards/beagle/beaglebone_ai64/doc/index.rst b/boards/beagle/beaglebone_ai64/doc/index.rst
index b5c69a818f3..d54775011db 100644
--- a/boards/beagle/beaglebone_ai64/doc/index.rst
+++ b/boards/beagle/beaglebone_ai64/doc/index.rst
@@ -1,7 +1,4 @@
-.. _beaglebone_ai64:
-
-BeagleBone AI-64
-################
+.. zephyr:board:: beaglebone_ai64
 
 Overview
 ********
@@ -9,11 +6,6 @@ Overview
 BeagleBone AI-64 is a computational platform powered by TI J721E SoC, which is
 targeted for automotive applications.
 
-.. figure:: assets/bbai_64.webp
-   :align: center
-   :width: 600px
-   :alt: BeagleBoard.org BeagleBone AI-64
-
 Hardware
 ********
 
diff --git a/boards/beagle/beagleconnect_freedom/doc/index.rst b/boards/beagle/beagleconnect_freedom/doc/index.rst
index f9b980c1f30..8bf3bf4e6e6 100644
--- a/boards/beagle/beagleconnect_freedom/doc/index.rst
+++ b/boards/beagle/beagleconnect_freedom/doc/index.rst
@@ -1,7 +1,4 @@
-.. _beagleconnect_freedom:
-
-BeagleConnect Freedom
-#####################
+.. zephyr:board:: beagleconnect_freedom
 
 Overview
 ********
@@ -9,14 +6,6 @@ Overview
 BeagleBoard.org BeagleConnect Freedom is a wireless
 Internet of Things board based on the SimpleLink multi-Standard CC1352P7 wireless MCU.
 
-
-.. figure:: img/beagleconnect_freedom.webp
-   :align: center
-   :width: 500px
-   :alt: BeagleBoard.org BeagleConnect Freedom
-
-   BeagleBoard.org BeagleConnect Freedom
-
 Hardware
 ********
 BeagleBoard.org BeagleConnect Freedom board features the TI CC1352P7 wireless microcontroller.
diff --git a/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst b/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
index fc36f0ce430..24665eafce1 100644
--- a/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
+++ b/boards/beagle/beagleplay/doc/beagleplay_cc1352p7.rst
@@ -1,7 +1,4 @@
-.. _beagleplay_cc1352p7:
-
-BeaglePlay (CC1352)
-###################
+.. zephyr:board:: beagleplay
 
 Overview
 ********
@@ -10,14 +7,6 @@ BeagleBoard.org BeaglePlay is an open hardware single board computer based on a
 quad-core ARM Cortex-A53 SoC with an external TI SimpleLink multi-standard CC1352P7 wireless MCU
 providing long-range, low-power connectivity.
 
-
-.. figure:: img/beagle_play.webp
-   :align: center
-   :width: 500px
-   :alt: BeagleBoard.org BeaglePlay
-
-   BeagleBoard.org BeaglePlay
-
 Hardware
 ********
 
diff --git a/boards/beagle/beaglev_fire/doc/index.rst b/boards/beagle/beaglev_fire/doc/index.rst
index 23d63f4db7a..e5e28f8cf72 100644
--- a/boards/beagle/beaglev_fire/doc/index.rst
+++ b/boards/beagle/beaglev_fire/doc/index.rst
@@ -1,7 +1,4 @@
-.. _beaglev_fire:
-
-BeagleV®-Fire
-#############
+.. zephyr:board:: beaglev_fire
 
 Overview
 ********
@@ -15,10 +12,6 @@ Built around the powerful and energy-efficient RISC-V instruction set architectu
 its versatile FPGA fabric, BeagleV®-Fire SBC offers unparalleled opportunities for developers,
 hobbyists, and researchers to explore and experiment with RISC-V technology.
 
-.. image:: img/BeagleV-Fire-Front-Annotated-768x432.webp
-     :align: center
-     :alt: beaglev_fire
-
 Building
 ========
 
diff --git a/doc/releases/release-notes-3.7.rst b/doc/releases/release-notes-3.7.rst
index 5c21c1e9e84..a71bc2a4d1f 100644
--- a/doc/releases/release-notes-3.7.rst
+++ b/doc/releases/release-notes-3.7.rst
@@ -455,7 +455,7 @@ Boards & SoC Support
   * nRF54H20 PDK (pre-release) converted to :ref:`nrf54h20dk_nrf54h20`
   * PPR core target in :ref:`nrf54h20dk_nrf54h20` runs from RAM by default. A
     new ``xip`` variant has been introduced which runs from MRAM (XIP).
-  * Refactored :ref:`beagleconnect_freedom` external antenna switch handling.
+  * Refactored :zephyr:board:`beagleconnect_freedom` external antenna switch handling.
   * Added Arduino dts node labels for the nRF5340 Audio DK.
   * Changed the default revision of the nRF54L15 PDK from 0.2.1 to 0.3.0.
   * In boards based on the nRF5340 SoC, replaced direct accesses to the register
@@ -1048,7 +1048,7 @@ Drivers and Sensors
   * Added a Add QTMR PWM driver for NXP imxrt11xx
   * Made the NXP MCUX PWM driver thread safe
   * Fix :zephyr:code-sample:`pwm-blinky` code sample to demonstrate PWM support for
-    :ref:`beagleconnect_freedom`.
+    :zephyr:board:`beagleconnect_freedom`.
   * Added driver for ENE KB1200.
   * Added support for Nordic nRF54H and nRF54L Series SoCs.
   * Added support for Nuvoton Numaker M2L31X series.