diff --git a/boards/cypress/cy8ckit_062_ble/doc/index.rst b/boards/cypress/cy8ckit_062_ble/doc/index.rst
index 01ad4696ea2..bda371372d8 100644
--- a/boards/cypress/cy8ckit_062_ble/doc/index.rst
+++ b/boards/cypress/cy8ckit_062_ble/doc/index.rst
@@ -1,7 +1,4 @@
-.. _cy8ckit_062_ble:
-
-INFINEON PSOC 63 BLE Pioneer Kit
-################################
+.. zephyr:board:: cy8ckit_062_ble
 
 Overview
 ********
@@ -30,10 +27,6 @@ enabling you to emulate a BLE host on your computer.
 The Cortex-M0+ is a primary core on the board's SoC. It starts first and
 enables the CM4 core.
 
-.. image:: img/cy8ckit-062-ble.jpg
-     :align: center
-     :alt: CY8CKIT_062_BLE
-
 1. Battery charging indicator (LED6)
 2. USB PD output voltage availability indicator (LED7)
 3. KitProg2 USB Type-C connector (J10)
diff --git a/boards/cypress/cy8ckit_062_wifi_bt/doc/index.rst b/boards/cypress/cy8ckit_062_wifi_bt/doc/index.rst
index a0ad601ad63..86b6806ede1 100644
--- a/boards/cypress/cy8ckit_062_wifi_bt/doc/index.rst
+++ b/boards/cypress/cy8ckit_062_wifi_bt/doc/index.rst
@@ -1,7 +1,4 @@
-.. _cy8ckit_062_wifi_bt:
-
-INFINEON PSOC 6 WiFi-BT Pioneer Kit
-###################################
+.. zephyr:board:: cy8ckit_062_wifi_bt
 
 Overview
 ********
@@ -23,10 +20,6 @@ The PSOC 6 WiFi-BT Pioneer board offers compatibility with Arduino shields.
 The Cortex-M0+ is a primary core on the board's SoC. It starts first and
 enables the CM4 core.
 
-.. image:: img/cy8ckit_062_wifi_bt_m0.jpg
-     :align: center
-     :alt: CY8CKIT_062_WIFI_BT
-
 1. USB PD output voltage availability indicator (LED7)
 2. Battery charging indicator (LED6)
 3. KitProg2 USB Type-C connector (J10)