diff --git a/boards/andes/index.rst b/boards/andes/index.rst
new file mode 100644
index 00000000000..17618d8186e
--- /dev/null
+++ b/boards/andes/index.rst
@@ -0,0 +1,10 @@
+.. _boards-andes:
+
+Andes Technology
+################
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/efinix/index.rst b/boards/efinix/index.rst
new file mode 100644
index 00000000000..901246a75a4
--- /dev/null
+++ b/boards/efinix/index.rst
@@ -0,0 +1,10 @@
+.. _boards-efinix:
+
+Efinix, Inc.
+############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/enjoy_digital/index.rst b/boards/enjoy_digital/index.rst
new file mode 100644
index 00000000000..aedf86d9ecd
--- /dev/null
+++ b/boards/enjoy_digital/index.rst
@@ -0,0 +1,10 @@
+.. _boards-enjoydigital:
+
+EnjoyDigital
+############
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/litex/litex_vexriscv/Kconfig.defconfig b/boards/enjoy_digital/litex_vexriscv/Kconfig.defconfig
similarity index 100%
rename from boards/litex/litex_vexriscv/Kconfig.defconfig
rename to boards/enjoy_digital/litex_vexriscv/Kconfig.defconfig
diff --git a/boards/litex/litex_vexriscv/Kconfig.litex_vexriscv b/boards/enjoy_digital/litex_vexriscv/Kconfig.litex_vexriscv
similarity index 100%
rename from boards/litex/litex_vexriscv/Kconfig.litex_vexriscv
rename to boards/enjoy_digital/litex_vexriscv/Kconfig.litex_vexriscv
diff --git a/boards/litex/litex_vexriscv/board.yml b/boards/enjoy_digital/litex_vexriscv/board.yml
similarity index 100%
rename from boards/litex/litex_vexriscv/board.yml
rename to boards/enjoy_digital/litex_vexriscv/board.yml
diff --git a/boards/litex/litex_vexriscv/doc/img/litex_vexriscv.jpg b/boards/enjoy_digital/litex_vexriscv/doc/img/litex_vexriscv.jpg
similarity index 100%
rename from boards/litex/litex_vexriscv/doc/img/litex_vexriscv.jpg
rename to boards/enjoy_digital/litex_vexriscv/doc/img/litex_vexriscv.jpg
diff --git a/boards/litex/litex_vexriscv/doc/img/symbiflow.svg b/boards/enjoy_digital/litex_vexriscv/doc/img/symbiflow.svg
similarity index 100%
rename from boards/litex/litex_vexriscv/doc/img/symbiflow.svg
rename to boards/enjoy_digital/litex_vexriscv/doc/img/symbiflow.svg
diff --git a/boards/litex/litex_vexriscv/doc/index.rst b/boards/enjoy_digital/litex_vexriscv/doc/index.rst
similarity index 100%
rename from boards/litex/litex_vexriscv/doc/index.rst
rename to boards/enjoy_digital/litex_vexriscv/doc/index.rst
diff --git a/boards/litex/litex_vexriscv/litex_vexriscv.dts b/boards/enjoy_digital/litex_vexriscv/litex_vexriscv.dts
similarity index 100%
rename from boards/litex/litex_vexriscv/litex_vexriscv.dts
rename to boards/enjoy_digital/litex_vexriscv/litex_vexriscv.dts
diff --git a/boards/litex/litex_vexriscv/litex_vexriscv.yaml b/boards/enjoy_digital/litex_vexriscv/litex_vexriscv.yaml
similarity index 100%
rename from boards/litex/litex_vexriscv/litex_vexriscv.yaml
rename to boards/enjoy_digital/litex_vexriscv/litex_vexriscv.yaml
diff --git a/boards/litex/litex_vexriscv/litex_vexriscv_defconfig b/boards/enjoy_digital/litex_vexriscv/litex_vexriscv_defconfig
similarity index 100%
rename from boards/litex/litex_vexriscv/litex_vexriscv_defconfig
rename to boards/enjoy_digital/litex_vexriscv/litex_vexriscv_defconfig
diff --git a/boards/lowrisc/index.rst b/boards/lowrisc/index.rst
new file mode 100644
index 00000000000..cc96e30f501
--- /dev/null
+++ b/boards/lowrisc/index.rst
@@ -0,0 +1,10 @@
+.. _boards-lowrisc:
+
+lowRISC
+#######
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*
diff --git a/boards/openisa/index.rst b/boards/openisa/index.rst
new file mode 100644
index 00000000000..d1a8c33af06
--- /dev/null
+++ b/boards/openisa/index.rst
@@ -0,0 +1,10 @@
+.. _boards-openisa:
+
+OpenISA
+#######
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   **/*