diff --git a/_templates/oshw.html b/_templates/oshw.html
index 04941e827f61f6fac256f1d1c6b00a06f75dee43..3dceed38fbf4cb8bd3f200dd9e9c2d47eac8ec35 100644
--- a/_templates/oshw.html
+++ b/_templates/oshw.html
@@ -4,7 +4,7 @@
<div class="card-body">
<p class="card-text text-dark">
<a href="https://certification.oshwa.org/{{ oshw_id|lower }}.html" target="_blank">
- <img src="../../../../_static/images/oshw/{{board}}_{{oshw_id}}.svg"/>
+ <img src="{{docs_url}}/_static/images/oshw/{{board}}_{{oshw_id}}.svg"/>
</a>
</p>
</div>
diff --git a/boards/beaglebone/ai-64/index.rst b/boards/beaglebone/ai-64/index.rst
index 22a80bb9ace7936bd908003e1ec3a91b7b6bbffd..e9a40f067cabf75ca1d57d4f71da6dcb1fb624fd 100644
--- a/boards/beaglebone/ai-64/index.rst
+++ b/boards/beaglebone/ai-64/index.rst
@@ -11,26 +11,13 @@ are all that need to be added to start building performance-optimized embedded a
expansion possibilities are enabled through familiar BeagleBone® cape headers, with hundreds of open-source
hardware examples and dozens of readily available embedded expansion options available off-the-shelf.
-.. grid:: 2
+.. admonition:: License Terms
- .. grid-item::
- :columns: 12 12 12 4
-
- .. figure:: images/OSHW_mark_US002120.*
- :width: 200
- :target: https://certification.oshwa.org/us002120.html
- :alt: BeagleBone AI-64 OSHW Mark
-
- .. grid-item::
- :columns: 12 12 12 8
-
- .. admonition:: License Terms
-
- * This work is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
- * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-ai-64>`__
- * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
- * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-ai-64>`__
- * For export, emissions and other compliance, see :ref:`bbai64-support`
+ * This work is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+ * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-ai-64>`__
+ * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+ * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-ai-64>`__
+ * For export, emissions and other compliance, see :ref:`bbai64-support`
.. image:: images/bbai64-45-front.jpg
:width: 740px
diff --git a/boards/beaglebone/ai/index.rst b/boards/beaglebone/ai/index.rst
index f8c20a77ceb5006df75a318abf193d874c1ee213..bfef2d4f210c0d088c973b86240b715b41060c63 100644
--- a/boards/beaglebone/ai/index.rst
+++ b/boards/beaglebone/ai/index.rst
@@ -10,26 +10,13 @@ digital-signal-processor (DSP) cores and embedded-vision-engine (EVE) cores supp
optimized TIDL machine learning OpenCL API with pre-installed tools. Focused on everyday
automation in industrial, commercial and home applications.
-.. grid:: 2
+.. admonition:: License Terms
- .. grid-item::
- :columns: 12 12 12 4
-
- .. figure:: images/OSHW_mark_US000169.*
- :width: 200
- :target: https://certification.oshwa.org/us000169.html
- :alt: BeagleBone AI OSHW Mark
-
- .. grid-item::
- :columns: 12 12 12 8
-
- .. admonition:: License Terms
-
- * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
- * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-ai>`__
- * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
- * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-ai>`__
- * For export, emissions and other compliance, see :ref:`bbai-support`
+ * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+ * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-ai>`__
+ * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+ * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-ai>`__
+ * For export, emissions and other compliance, see :ref:`bbai-support`
.. image:: images/BB_AI_handheld_500px.jpg
:width: 740
diff --git a/boards/beaglebone/black/index.rst b/boards/beaglebone/black/index.rst
index 188d79bc273b0d4bced35cb87a4dc2a33ad29499..f4b3775885be4e496b790bff0772e390c174dee4 100644
--- a/boards/beaglebone/black/index.rst
+++ b/boards/beaglebone/black/index.rst
@@ -6,26 +6,13 @@ BeagleBone Black
BeagleBone Black is a low-cost, community-supported development platform for developers and hobbyists.
Boot Linux in under 10 seconds and get started on development in less than 5 minutes with just a single USB cable.
-.. grid:: 2
+.. admonition:: License Terms
- .. grid-item::
- :columns: 12 12 12 4
-
- .. figure:: images/OSHW_mark_US000236.*
- :width: 200
- :target: https://certification.oshwa.org/us000236.html
- :alt: BeagleBone Black OSHW Mark
-
- .. grid-item::
- :columns: 12 12 12 8
-
- .. admonition:: License Terms
-
- * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
- * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-black>`__
- * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
- * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-black>`__
- * For export, emissions and other compliance, see :ref:`beagleboneblack-support`
+ * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+ * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-black>`__
+ * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+ * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-black>`__
+ * For export, emissions and other compliance, see :ref:`beagleboneblack-support`
.. image:: images/image1.jpg
:width: 598
diff --git a/boards/beaglebone/blue/index.rst b/boards/beaglebone/blue/index.rst
index 2735f3462a0f9acf855f7dda8791d2546b895051..b1f243374cd648ea8edbd3034aada938bdf694ad 100644
--- a/boards/beaglebone/blue/index.rst
+++ b/boards/beaglebone/blue/index.rst
@@ -15,25 +15,12 @@ robotics by `UCSD Flow Control and Coordinated Robotics Lab <http://robotics.ucs
`WowWee <http://www.wowwee.com/mip/>`_, `National Instruments LabVIEW <http://www.ni.com/labview/>`_
and of course the `BeagleBoard.org Foundation <https://beagleboard.org/about>`_.
-.. grid:: 2
+.. admonition:: License Terms
- .. grid-item::
- :columns: 12 12 12 4
-
- .. figure:: images/OSHW_mark_US000064.*
- :width: 200
- :target: https://certification.oshwa.org/us000064.html
- :alt: BeagleBone Blue OSHW Mark
-
- .. grid-item::
- :columns: 12 12 12 8
-
- .. admonition:: License Terms
-
- * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
- * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-blue>`__
- * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
- * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-blue>`__
+ * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+ * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/beaglebone-blue>`__
+ * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+ * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglebone-blue>`__
.. toctree::
:maxdepth: 1
diff --git a/boards/beagleconnect/freedom/index.rst b/boards/beagleconnect/freedom/index.rst
index dacd4a174204db254deb29c6b58bfd4de96351d8..9c5d1723791c2cf4257abea4b34deb11ad673923 100644
--- a/boards/beagleconnect/freedom/index.rst
+++ b/boards/beagleconnect/freedom/index.rst
@@ -21,26 +21,13 @@ over-the-air upgrades (OTA) capability. This MCU provides flexible support for m
This is a work in progress, for latest documentation please
visit https://docs.beagleboard.org/latest/
-.. grid:: 2
+.. admonition:: License Terms
- .. grid-item::
- :columns: 12 12 12 4
-
- .. figure:: images/OSHW_mark_US002175.*
- :width: 200
- :target: https://certification.oshwa.org/us002175.html
- :alt: BeagleConnectâ„¢ Freedom OSHW Mark
-
- .. grid-item::
- :columns: 12 12 12 8
-
- .. admonition:: License Terms
-
- * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
- * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleconnect/freedom>`__
- * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
- * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beagleconnect-freedom>`__
- * For export, emissions and other compliance, see :ref:`beagleconnect-freedom-support`
+ * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+ * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleconnect/freedom>`__
+ * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+ * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beagleconnect-freedom>`__
+ * For export, emissions and other compliance, see :ref:`beagleconnect-freedom-support`
.. raw:: latex
diff --git a/boards/beagleplay/index.rst b/boards/beagleplay/index.rst
index 868bc38ded5a392d9255a7bab2a6ddcfe5ead39d..f46a1f731c4578fddaa1fbf5f9b7999a1645e12c 100644
--- a/boards/beagleplay/index.rst
+++ b/boards/beagleplay/index.rst
@@ -10,26 +10,13 @@ BeaglePlay
BeaglePlay is an open-source single board computer based on the Texas Instruments AM6254 quad-core Cortex-A53 Arm SoC designed to simplify the process of adding
sensors, actuators, indicators, human interfaces, and connectivity to a reliable embedded system.
-.. grid:: 2
+.. admonition:: License Terms
- .. grid-item::
- :columns: 12 12 12 4
-
- .. figure:: images/OSHW_mark_US002174.*
- :width: 200
- :target: https://certification.oshwa.org/us002174.html
- :alt: BeaglePlay OSHW Mark
-
- .. grid-item::
- :columns: 12 12 12 8
-
- .. admonition:: License Terms
-
- * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
- * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleplay/beagleplay>`__
- * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
- * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beagleplay>`__
- * For export, emissions and other compliance, see :ref:`beagleplay-support`
+ * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+ * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleplay/beagleplay>`__
+ * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+ * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beagleplay>`__
+ * For export, emissions and other compliance, see :ref:`beagleplay-support`
.. table::
:align: center
diff --git a/boards/beaglev/ahead/index.rst b/boards/beaglev/ahead/index.rst
index 0a9b161d78249f16cb27dd8a17b1183017f100c1..d1fd481247843cc8bf65fabb9305f21966459d98 100644
--- a/boards/beaglev/ahead/index.rst
+++ b/boards/beaglev/ahead/index.rst
@@ -8,26 +8,13 @@ BeagleBone Black allowing you to stack your favourite BeagleBone cape on top to
Featuring a powerful quad-core RISC-V processor BeagleV Ahead is designed as an affordable
RISC-V enabled pocket-size computer for anybody who want's to dive deep into the new RISC-V ISA.
-.. grid:: 2
+.. admonition:: License Terms
- .. grid-item::
- :columns: 12 12 12 4
-
- .. figure:: images/OSHW_mark_US002535.*
- :width: 200
- :target: https://certification.oshwa.org/us002535.html
- :alt: BeagleV-Ahead OSHW Mark
-
- .. grid-item::
- :columns: 12 12 12 8
-
- .. admonition:: License Terms
-
- * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
- * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beaglev-ahead/beaglev-ahead>`__
- * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
- * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglev-ahead>`__
- * For export, emissions and other compliance, see :ref:`beaglev-ahead-support`
+ * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+ * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beaglev-ahead/beaglev-ahead>`__
+ * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+ * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglev-ahead>`__
+ * For export, emissions and other compliance, see :ref:`beaglev-ahead-support`
.. image:: images/BeagleV-Ahead-with-hand.*
:align: center
diff --git a/boards/beaglev/fire/index.rst b/boards/beaglev/fire/index.rst
index e0f68a8fb04e6eb54b8f8df309499e316fe3eedb..3f3a2255153d074eec6bb58b2fb858437824a22f 100644
--- a/boards/beaglev/fire/index.rst
+++ b/boards/beaglev/fire/index.rst
@@ -9,27 +9,13 @@ of RISC-V architecture and FPGA technology. It has the same P8 & P9 cape header
cape on top to expand it's capability. Built around the powerful and energy-efficient RISC-V instruction set architecture (ISA) along with its versatile FPGA fabric,
BeagleV®-Fire SBC offers unparalleled opportunities for developers, hobbyists, and researchers to explore and experiment with RISC-V technology.
-.. grid:: 2
-
- .. grid-item::
- :columns: 12 12 12 4
-
- .. figure:: images/certification-mark-US002572-stacked.*
- :width: 200
- :target: https://certification.oshwa.org/us002572.html
- :alt: BeagleV-Fire OSHW Mark
-
- .. grid-item::
- :columns: 12 12 12 8
-
- .. admonition:: License Terms
-
- * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
- * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beaglev-fire/beaglev-fire>`__
- * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
- * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglev-fire>`__
- * For export, emissions and other compliance, see :ref:`beaglev-fire-support`
+.. admonition:: License Terms
+ * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+ * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beaglev-fire/beaglev-fire>`__
+ * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+ * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/beaglev-fire>`__
+ * For export, emissions and other compliance, see :ref:`beaglev-fire-support`
.. image:: images/BeagleV-Fire-hero.*
:align: center
diff --git a/boards/pocketbeagle/original/index.rst b/boards/pocketbeagle/original/index.rst
index 6c0b268c69973ec5029089c156247bf26b38bd2a..461d3769d893a6a748cced1d022afeb0da7c1da5 100644
--- a/boards/pocketbeagle/original/index.rst
+++ b/boards/pocketbeagle/original/index.rst
@@ -7,26 +7,13 @@ PocketBeagle is an ultra-tiny-yet-complete open-source USB-key-fob computer.
PocketBeagle features an incredible low cost, slick design and simple usage,
making PocketBeagle the ideal development board for beginners and professionals alike.
-.. grid:: 2
+.. admonition:: License Terms
- .. grid-item::
- :columns: 12 12 12 4
-
- .. figure:: images/OSHW_mark_US000083.*
- :width: 200
- :target: https://certification.oshwa.org/us000083.html
- :alt: PocketBeagle OSHW mark
-
- .. grid-item::
- :columns: 12 12 12 8
-
- .. admonition:: License Terms
-
- * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
- * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/pocketbeagle>`__
- * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
- * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/pocketbeagle-original>`__
- * For export, emissions and other compliance, see :ref:`pocketbeagle_support_information`
+ * This documentation is licensed under a `Creative Commons Attribution-ShareAlike 4.0 International License <http://creativecommons.org/licenses/by-sa/4.0/>`__
+ * Design materials and license can be found in the `git repository <https://git.beagleboard.org/beagleboard/pocketbeagle>`__
+ * Use of the boards or design materials constitutes an agreement to the :ref:`boards-terms-and-conditions`
+ * Software images and purchase links available on the `board page <https://www.beagleboard.org/boards/pocketbeagle-original>`__
+ * For export, emissions and other compliance, see :ref:`pocketbeagle_support_information`
.. image:: images/PocketBeagle-size-compare-small.*
:width: 598