diff --git a/boards/beaglev/fire/02-quick-start.rst b/boards/beaglev/fire/02-quick-start.rst
index 53f58af2f5738f64f62003b07df462c2090d8715..443a1e3d98fc19a4e24751455062dfcdc81d9c59 100644
--- a/boards/beaglev/fire/02-quick-start.rst
+++ b/boards/beaglev/fire/02-quick-start.rst
@@ -75,7 +75,8 @@ It will be different for Mac and Windows operatig systems. To find serial port f
 Demos and Tutorials
 *******************
 
-* :ref:`beaglev-fire-flashing-board`
 * :ref:`beaglev-fire-gateware-version`
+* :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 1c2a2c698f3cdf6254c20181aa9b6f91b6171330..ad003fa2421b6a35b6beb8ca5f34e62ec61daac1 100644
--- a/boards/beaglev/fire/05-demos.rst
+++ b/boards/beaglev/fire/05-demos.rst
@@ -16,5 +16,5 @@ Demos
     
     demos-and-tutorials/flashing-board
     demos-and-tutorials/mchp-fpga-tools-installation-guide
-    demos-and-tutorials/gateware
-    demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board.rst
+    demos-and-tutorials/gateware/index
+    demos-and-tutorials/gateware/how-to-find-out-whats-on-the-board
diff --git a/boards/beaglev/fire/demos-and-tutorials/flashing-board.rst b/boards/beaglev/fire/demos-and-tutorials/flashing-board.rst
index ae933e477b7f080eef059568f5f663574bdc9ab8..52d52f6aa550c78705dcd3aa4f22beadf8adcaf4 100644
--- a/boards/beaglev/fire/demos-and-tutorials/flashing-board.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/flashing-board.rst
@@ -3,6 +3,12 @@
 Flashing gateware and Linux image
 ##################################
 
+.. todo::
+
+   This is the *hard* way! Special cables and FlashPros are not required when using the firmware we initially ship on the board. This tutorial should be
+   rescripted as how to _unbrick_ your board. Also, we have other work-arounds using software and GPIOs rather than FlashPros. Let's not put this in user's
+   face as *the* experience when it is far more painful than using the `change-gateware.sh` script and "hold BOOT button when applying power" solutions we've created!
+
 In this tutorial we are going to learn to flash the gateware image
 to FPGA and ``sdcard.image`` to eMMC storage.
 
diff --git a/boards/beaglev/fire/demos-and-tutorials/mchp-fpga-tools-installation-guide.rst b/boards/beaglev/fire/demos-and-tutorials/mchp-fpga-tools-installation-guide.rst
index a0bfe8c1c4d4ee158497dd6650d0584c5d362088..eafcae5f56bd02f77cf7f3f86d19cc2f514767f1 100644
--- a/boards/beaglev/fire/demos-and-tutorials/mchp-fpga-tools-installation-guide.rst
+++ b/boards/beaglev/fire/demos-and-tutorials/mchp-fpga-tools-installation-guide.rst
@@ -5,6 +5,15 @@ Microchip FPGA Tools Installation Guide
 
 Instructions for installing the Microchip FPGA tools on a Ubuntu 20.04 desktop.
 
+.. important::
+
+   We will be providing instances of Libero that you can run from git.beagleboard.org's gitlab-runners such that you do not need to install the tools on
+   your local machine.
+
+.. todo::
+
+   Make sure people know about the alternative and we provide links to details on that before we send them down this process.
+
 Install Libero 2022.3
 ************************