diff --git a/boards/amd/acp_6_0_adsp/acp_6_0_acp_adsp.dts b/boards/amd/acp_6_0_adsp/acp_6_0_adsp.dts
similarity index 100%
rename from boards/amd/acp_6_0_adsp/acp_6_0_acp_adsp.dts
rename to boards/amd/acp_6_0_adsp/acp_6_0_adsp.dts
diff --git a/boards/amd/acp_6_0_adsp/doc/index.rst b/boards/amd/acp_6_0_adsp/doc/index.rst
index fcc9221eafc..91595052a60 100644
--- a/boards/amd/acp_6_0_adsp/doc/index.rst
+++ b/boards/amd/acp_6_0_adsp/doc/index.rst
@@ -26,15 +26,7 @@ Hardware
 Supported Features
 ==================
 
-The following hardware features are supported:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| I2S       | on-chip    | I2S controller                      |
-+-----------+------------+-------------------------------------+
-| DMIC(PDM) | on-chip    | PDM controller                      |
-+-----------+------------+-------------------------------------+
+.. zephyr:board-supported-hw::
 
 System Clock
 ============
diff --git a/boards/amd/kv260_r5/doc/index.rst b/boards/amd/kv260_r5/doc/index.rst
index 9383dbd9df6..c71eddbec65 100644
--- a/boards/amd/kv260_r5/doc/index.rst
+++ b/boards/amd/kv260_r5/doc/index.rst
@@ -19,20 +19,7 @@ Hardware
 Supported Features
 ==================
 
-The following hardware features are supported:
-
-+--------------+------------+----------------------+
-| Interface    | Controller | Driver/Component     |
-+==============+============+======================+
-| GIC          | on-chip    | generic interrupt    |
-|              |            | controller           |
-+--------------+------------+----------------------+
-| TTC          | on-chip    | system timer         |
-+--------------+------------+----------------------+
-| UART         | on-chip    | serial port          |
-+--------------+------------+----------------------+
-
-The kernel currently does not support other hardware features on this platform.
+.. zephyr:board-supported-hw::
 
 Devices
 ========