diff --git a/boards/beagleplay/02-quick-start.rst b/boards/beagleplay/02-quick-start.rst
index 57b909bfc4606f67712a8aa7ede93d014014eeeb..0437249f84e8c82bc8e7c73c1e64a1188907c2f2 100644
--- a/boards/beagleplay/02-quick-start.rst
+++ b/boards/beagleplay/02-quick-start.rst
@@ -24,12 +24,10 @@ Attaching antennas
You can watch this video to see how to attach the attennas.
-.. admonition:: YouTube video of BeaglePlay antenna connection
-
- .. youtube:: 8zeIVd-JRc0
- :width: 1280
- :height: 720
- :align: center
+.. youtube:: 8zeIVd-JRc0
+ :width: 1280
+ :height: 720
+ :align: center
Tethering to PC
****************
diff --git a/boards/beaglev/fire/02-quick-start.rst b/boards/beaglev/fire/02-quick-start.rst
index dcd2c253538e8bbc78df493034518ca3db0e1900..f25e68ba3c610a62cbc82f275a38ab790d1e4927 100644
--- a/boards/beaglev/fire/02-quick-start.rst
+++ b/boards/beaglev/fire/02-quick-start.rst
@@ -79,6 +79,7 @@ Demos and Tutorials
*******************
* :ref:`beaglev-fire-gateware-version`
+* :ref:`beaglev-fire-upgrade-gateware`
* :ref:`beaglev-fire-flashing-board`
* :ref:`beaglev-fire-gateware-design`
* :ref:`beaglev-fire-mchp-fpga-tools-installation-guide`
diff --git a/boards/beaglev/fire/05-demos.rst b/boards/beaglev/fire/05-demos.rst
index 52a0c62c4094a140b6e5006c816742b27fcf7766..6c059cd81cbf0f075c23439bcf5dcf0f41b9f139 100644
--- a/boards/beaglev/fire/05-demos.rst
+++ b/boards/beaglev/fire/05-demos.rst
@@ -14,6 +14,7 @@ Demos
.. toctree::
:maxdepth: 1
+ demos-and-tutorials/gateware/upgrade-gateware
demos-and-tutorials/flashing-board
demos-and-tutorials/mchp-fpga-tools-installation-guide
demos-and-tutorials/gateware/index
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.rst
index 62b7fdb37510d53ecdaafd287c540d366fcca4db..00112f422af6fdd572f28dca0f866e2682e9d4ac 100644
--- a/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/customize-cape-gateware-verilog.rst
@@ -28,6 +28,11 @@ Steps:
Fork BeagleV-Fire Gateware Repository
**************************************
+.. important::
+ All new users need to be manually approved to protect from BOT spam. You will not be able to fork the Gateware
+ Repository until you have been approved. A request to 'the forum <https://forum.beagleboard.org/t/requesting-access-to-gitlab-to-fork-gateware/37494>'
+ may expedite the process.
+
Navigate to BeagleV-Fire's `gateware source code repository <https://git.beagleboard.org/beaglev-fire/gateware>`_.
Click on the ``Forks`` button on the top-right corner.
diff --git a/boards/beaglev/fire/demos-and-tutorials/gateware/upgrade-gateware.rst b/boards/beaglev/fire/demos-and-tutorials/gateware/upgrade-gateware.rst
new file mode 100644
index 0000000000000000000000000000000000000000..58f23769524cffceb4890af7d05593b096d5a293
--- /dev/null
+++ b/boards/beaglev/fire/demos-and-tutorials/gateware/upgrade-gateware.rst
@@ -0,0 +1,143 @@
+.. _beaglev-fire-upgrade-gateware:
+
+Upgrade BeagleV-Fire Gateware
+####################################
+
+This document describes how to upgrade your BeagleV-Fire's gateware. This approach can be used out
+of the box using Linux commands executed on BeagleV-Fire
+
+Required Equipment
+********************
+- BeagleV-Fire board
+- USB-C cable
+- Ethernet cable
+
+The USB-C cable provides power, a serial interface to BeagleV-Fire and allows connecting to
+BeagleV-Fire through a browser using IP address ``192.168.7.2``.
+
+The Ethernet cable connected to your local network (LAN) allows connecting to BeagleV-Fire using
+the SSH protocol. It also allows BeagleV-Fire to retrieve updated packages through your local
+network's Internet connection.
+
+Connect to BeagleV-Fire Linux Command Line Interface
+*****************************************************
+BeagleV-Fire boots Linux out of the box. Like all Beagleboard boards there are several methods to
+get BeagleV-Fire's Linux command prompt.
+
+- Cockpit
+- SSH
+- Serial port
+
+Cockpit
+========
+
+Enter the following URL in your web browser: ``https://beaglev.localdomain:9090/``
+
+On first use, click through the security warning. Login using ``beagle/temppwd`` as user/password.
+Click on Terminal in the left pane. You now have a Linux command prompt running on your
+BeagleV-Fire. Next step: enter the commands described in the Gateware Upgrade Linux Commands
+section of this document.
+
+.. note::
+
+ You can connect to the Cockpit using the IP address dynamically assigned to your
+ BeagleV-Fire in your local Ethernet network. One method of finding the value of that
+ dynamically assigned IP address is to open a serial terminal though the USB port and use the
+ ``ip address`` Linux command. Please refer to the USB Serial Port section.
+
+SSH
+====
+
+Like all Beagleboard boards, you can SSH to the board through the USB interface by using IP
+address 192.168.7.2.
+
+.. note::
+
+ On Windows, this approach may require some drivers to be updated or installed. Use one of the
+ other approaches if you are not immediately successful with this one. You can circle back later
+ to adjust your Windows installation if required.
+
+Serial Port
+================
+
+A serial port is available through the USB-C port. This serial port becomes available once Linux
+has booted on BeagleV-Fire. Please wait a couple of minutes after powering up the board before
+looking for additional serial ports reported by your host computer's operating system. You can then
+use your favorite serial port terminal tool such as Putty or Screen to access the BeagleV-Fire
+Linux command prompt.
+
+For example on your Linux host computer:
+
+.. code-block:: shell
+
+ screen /dev/ttyACM0 115200
+
+Where ``ttyACM0`` is an additional serial port that appeared after BeagleV-Fire was connected to
+your Linux host computer. This serial port can be identified using the ``dmesg | grep tty`` Linux
+command which will show the most recent serial port added to the host computer.
+
+On Windows, BeagleV-Fire's serial port number will show in the Windows Device Manager. Use that
+serial port number in Putty with a speed 115200 baud, no flow-control.
+
+Gateware Upgrade Linux Commands
+********************************
+
+.. note::
+
+ BeagleV-Fire needs to be connected to the internet through your local network for the commands
+ in this section to work. The connection can be through the Ethernet port or the Wi-Fi module.
+
+Install bbb.io-gateware
+========================
+
+You need to install the bbb.io-gateware package. This will allow retrieving the most up-to-date
+gateware.
+
+.. code-block:: shell
+
+ sudo apt install bbb.io-gateware
+
+Retrieve Available Updated Linux packages List
+===============================================
+
+The list will include the latest BeagleV-Fire gateware packages.
+
+.. code-block:: shell
+
+ sudo apt update
+
+Upgrade Linux Packages
+=======================
+
+This will upgrade the BeagleV-Fire gateware Linux programming files located
+under ``/usr/share/beagleboard/gateware``. Several directories are found in that location, each
+containing programming files for one individual gateware configuration.
+
+.. code-block:: shell
+
+ sudo apt upgrade
+
+Launch Reprogramming of BeagleV-Fire's FPGA
+============================================
+
+Change directory to ``/usr/share/beagleboard/gateware``. This directory contains a script
+performing the gateware's reprogramming. It also contains one directory for each of the possible
+gateware configuration that can be programmed into your BeagleV-Fire. The name of one of these
+directories is passed as argument to the script to specify which gateware configuration you wish to
+program your BeagleV-Fire with.
+
+.. code-block:: shell
+
+ cd /usr/share/beagleboard/gateware
+ . ./change-gateware.sh default
+
+.. important::
+ Do not power-off BeagleV-Fire until it has rebooted by itself. The gateware reprogramming may
+ take a couple of minutes.
+
+The change-gateware script programs the selected gateware and its associated device tree overlays
+into the PolarFire SoC System Controllers SPI flash and triggers a software reboot. During the
+reboot, the Hart Software Services (HSS) will request the PolarFire SoC System Controller to
+reprogram the FPGA and eNVM. The PolarFire SoC System Controller will reprogram the FPGA if it
+finds it contains a different design version than the one in the SPI Flash. The board reboots on
+completion of the FPGA reprogramming.
diff --git a/boards/beagley/ai/02-quick-start.rst b/boards/beagley/ai/02-quick-start.rst
new file mode 100644
index 0000000000000000000000000000000000000000..eec6c15e5180f7512b200a520e28354c8cf18f11
--- /dev/null
+++ b/boards/beagley/ai/02-quick-start.rst
@@ -0,0 +1,9 @@
+.. _beagley-ai-quick-start:
+
+BeagleY-AI Quick Start
+######################
+
+.. important:: Coming Soon!
+
+
+For now, see https://www.beagleboard.org/app/uploads/2024/03/Getting-started-with-your-BeagleY-AI.pdf
diff --git a/boards/beagley/ai/index.rst b/boards/beagley/ai/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..343fc202a6e4f567c09c1f45bd7098566aee2c78
--- /dev/null
+++ b/boards/beagley/ai/index.rst
@@ -0,0 +1,11 @@
+.. _beagley-ai-home:
+
+BeagleY-AI
+##########
+
+.. important:: Coming soon!
+
+.. toctree::
+ :maxdepth: 1
+
+ 02-quick-start
diff --git a/boards/beagley/index.rst b/boards/beagley/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..376ff8f41e6c322512869526d7b465bf400e903c
--- /dev/null
+++ b/boards/beagley/index.rst
@@ -0,0 +1,7 @@
+.. _beagley-all-home:
+
+BeagleY
+#######
+
+See :ref:`beagley-ai-home`
+
diff --git a/boards/index.rst b/boards/index.rst
index 89bacb47125ae903b5826638f40215722475a079..0f161d75213f2d3c421377573f1e45d913d5f145 100644
--- a/boards/index.rst
+++ b/boards/index.rst
@@ -38,6 +38,8 @@ started.
.. toctree::
:maxdepth: 1
+ /boards/beagley/ai/index
+ /boards/beagleplay/index
beagleplay/index
beaglebone/ai-64/index
beaglebone/ai/index
diff --git a/index-tex.rst b/index-tex.rst
index e156f11760807ab4cb735af2d7c3982f495137e8..46f60a912c3c3dc79bd6e5585be27cfe481ae7b1 100644
--- a/index-tex.rst
+++ b/index-tex.rst
@@ -11,6 +11,7 @@ BeagleBoard Docs
.. toctree::
intro/index
+ boards/beagley/ai/index
boards/beagleplay/index
boards/beaglebone/ai-64/index
boards/beaglebone/ai/index
diff --git a/intro/contribution/rst-cheat-sheet.rst b/intro/contribution/rst-cheat-sheet.rst
index 25a362d054d644375e5495764a0e5796fe9b191b..230ef840ed2fe611b412a696b574edf70b6f9e3a 100644
--- a/intro/contribution/rst-cheat-sheet.rst
+++ b/intro/contribution/rst-cheat-sheet.rst
@@ -329,13 +329,7 @@ This site uses sphinxcontrib-youtube to embed YouTube videos. The syntax is as f
.. callout::
- .. code-block:: rst
-
- .. _internal-link: <1>
-
- .. admonition:: YouTube Video Description <2>
-
- .. youtube:: <YouTube_video_ID> <3>
+ .. youtube:: <YouTube_video_ID>
.. annotations::