diff --git a/boards/sifive/hifive1/doc/index.rst b/boards/sifive/hifive1/doc/index.rst
index 2c3d2ba1fb6..dcd9a2948ef 100644
--- a/boards/sifive/hifive1/doc/index.rst
+++ b/boards/sifive/hifive1/doc/index.rst
@@ -1,7 +1,4 @@
-.. _hifive1:
-
-SiFive HiFive1
-##############
+.. zephyr:board:: hifive1
 
 Overview
 ********
diff --git a/boards/sifive/hifive_unleashed/doc/index.rst b/boards/sifive/hifive_unleashed/doc/index.rst
index f2dd987ff03..647911746fc 100644
--- a/boards/sifive/hifive_unleashed/doc/index.rst
+++ b/boards/sifive/hifive_unleashed/doc/index.rst
@@ -1,7 +1,4 @@
-.. _hifive_unleashed:
-
-SiFive HiFive Unleashed
-#######################
+.. zephyr:board:: hifive_unleashed
 
 Overview
 ********
@@ -9,10 +6,6 @@ Overview
 The HiFive Unleashed is a development board with a SiFive FU540-C000
 multi-core 64bit RISC-V SoC.
 
-.. image:: img/hifive_unleashed.jpg
-   :align: center
-   :alt: SiFive HiFive Unleashed board
-
 Programming and debugging
 *************************
 
diff --git a/boards/sifive/hifive_unmatched/doc/index.rst b/boards/sifive/hifive_unmatched/doc/index.rst
index da374e37679..2ff4d5de6e3 100644
--- a/boards/sifive/hifive_unmatched/doc/index.rst
+++ b/boards/sifive/hifive_unmatched/doc/index.rst
@@ -1,7 +1,4 @@
-.. _hifive_unmatched:
-
-SiFive HiFive Unmatched
-#######################
+.. zephyr:board:: hifive_unmatched
 
 Overview
 ********
@@ -9,10 +6,6 @@ Overview
 The HiFive Unmatched is a development board with a SiFive FU740-C000
 multi-core 64bit RISC-V SoC.
 
-.. image:: img/hifive_unmatched.jpg
-   :align: center
-   :alt: SiFive HiFive Unmatched board
-
 Programming and debugging
 *************************