diff --git a/boards/segger/ip_k66f/doc/index.rst b/boards/segger/ip_k66f/doc/index.rst
index 902802eb6d3..d836ed3ec4d 100644
--- a/boards/segger/ip_k66f/doc/index.rst
+++ b/boards/segger/ip_k66f/doc/index.rst
@@ -32,28 +32,7 @@ For more information about the K66F SoC and IP-K66F board:
 Supported Features
 ==================
 
-The ip_k66f board configuration supports the following hardware features:
-
-+-----------+------------+-------------------------------------+
-| Interface | Controller | Driver/Component                    |
-+===========+============+=====================================+
-| NVIC      | on-chip    | nested vector interrupt controller  |
-+-----------+------------+-------------------------------------+
-| SYSTICK   | on-chip    | systick                             |
-+-----------+------------+-------------------------------------+
-| PINMUX    | on-chip    | pinmux                              |
-+-----------+------------+-------------------------------------+
-| GPIO      | on-chip    | gpio                                |
-+-----------+------------+-------------------------------------+
-| WATCHDOG  | on-chip    | watchdog                            |
-+-----------+------------+-------------------------------------+
-| FLASH     | on-chip    | soc flash                           |
-+-----------+------------+-------------------------------------+
-| RTC       | on-chip    | rtc                                 |
-+-----------+------------+-------------------------------------+
-
-The default configuration can be found in
-:zephyr_file:`boards/segger/ip_k66f/ip_k66f_defconfig`
+.. zephyr:board-supported-hw::
 
 Micrel/Microchip KSZ8794CNX Ethernet Switch is supported
 (see :zephyr:code-sample:`dsa` sample).
diff --git a/boards/segger/trb_stm32f407/doc/index.rst b/boards/segger/trb_stm32f407/doc/index.rst
index 0b90123c411..53f78603f59 100644
--- a/boards/segger/trb_stm32f407/doc/index.rst
+++ b/boards/segger/trb_stm32f407/doc/index.rst
@@ -19,28 +19,7 @@ and the datasheet.
 Supported Features
 ==================
 
-The SEGGER-TRB-STM32F407 board configuration supports the following
-hardware features:
-
-+------------+------------+------------------------------+
-| Interface  | Controller | Driver/Component             |
-+============+============+==============================+
-| NVIC       | on-chip    | nested vectored              |
-|            |            | interrupt controller         |
-+------------+------------+------------------------------+
-| SYSTICK    | on-chip    | system clock                 |
-+------------+------------+------------------------------+
-| GPIO       | on-chip    | gpio                         |
-+------------+------------+------------------------------+
-| WATCHDOG   | on-chip    | independent watchdog         |
-+------------+------------+------------------------------+
-| COUNTER    | on-chip    | rtc                          |
-+------------+------------+------------------------------+
-| RNG        | on-chip    | True Random number generator |
-+------------+------------+------------------------------+
-
-
-Other hardware features have not been enabled yet for this board.
+.. zephyr:board-supported-hw::
 
 Pin Mapping
 ===========