diff --git a/site/source/diy.rst b/site/source/diy.rst
index 794413d..5bcec0a 100644
--- a/site/source/diy.rst
+++ b/site/source/diy.rst
@@ -83,6 +83,11 @@ You can follow along with this `written guide <https://start9dave.substack.com/p
   .. youtube:: Z1EW1TVgtow
     :width: 100%
 
+.. raw:: html
+
+  <br>
+  <br>
+
 Getting embassyOS
 -----------------
 After building your device, you need a copy of embassyOS.
@@ -109,11 +114,4 @@ Next, you'll need to flash embassyOS onto a microSD card.
     .. warning:: Be certain you have selected the correct target microSD card. Whatever target you select will be completely erased and replaced with embassyOS.
 
 #. Click "Flash!". You may be asked to (1) approve the unusually large disk target or (2) enter your password. Both are normal.
-#. After the flash completes, you may remove the micro SD from the adapter, insert it into your Embassy's SD card slot, and continue to the :ref:`Initial Setup <initial-setup>` instructions.
-
-Upgrading from an External Drive Setup
---------------------------------------
-If you already have an Embassy with an external drive, you can follow along from the `written guide appendix <https://start9dave.substack.com/i/68242394/appendix-transfer-embassy-from-existing-case>`_ and/or check out the video below:
-
-  .. youtube:: 355BENA42s8
-    :width: 100%
+#. After the flash completes, you may remove the micro SD from the adapter, insert it into your Embassy's SD card slot, and continue to the :ref:`Initial Setup <initial-setup>` instructions.
\ No newline at end of file
diff --git a/site/source/user-manual/upgrade-02/index.rst b/site/source/user-manual/upgrade-02/index.rst
index 57f070e..bf7b09f 100644
--- a/site/source/user-manual/upgrade-02/index.rst
+++ b/site/source/user-manual/upgrade-02/index.rst
@@ -1,8 +1,11 @@
 .. _upgrade-02:
 
-====================
-Upgrading from 0.2.x
-====================
+================
+Upgrade Hardware
+================
+
+Embassy One
+-----------
 
 .. raw:: html
 
@@ -17,7 +20,7 @@ Upgrading from 0.2.x
   :class: large-5
   :anchor: Upgrade
 
-  This is for if you purchased an upgrade kit from us
+  This is for if you purchased an upgrade kit from us to migrate from embassyOS v0.2.x to v0.3+
 
 .. topic-box::
   :title: Bring your own equipment
@@ -26,15 +29,34 @@ Upgrading from 0.2.x
   :class: large-5
   :anchor: Upgrade
 
-  This is for if you purchased your own hardware
+  This is for if you purchased your own hardware to migrate from embassyOS v0.2.x to v0.3+
+
+.. topic-box::
+  :title: Upgrade to all-in-one NASPi case
+  :link: naspi-upgrade
+  :icon: scylla-icon scylla-icon--home
+  :class: large-5
+  :anchor: Upgrade
+
+  This is for if you purchased a NASPi upgrade kit from us
+
 
 .. raw:: html
 
   </div></div>
 
+
+Upgrade to Embassy Pro
+----------------------
+
+You can migrate from an Embassy One to an Embassy Pro simply by shutting down your Embassy One, removing the SSD and connecting it to your new Embassy Pro! 
+
+Your data will then migrate from your Embassy One to your Embassy Pro during :ref:`Initial setup. <initial-setup>`
+
 .. toctree::
    :maxdepth: 2
    :hidden:
 
    Upgrade Kit <upgrade-kit>
    DIY Hardware <upgrade-diy>
+   NASPi upgrade <naspi-upgrade>
\ No newline at end of file
diff --git a/site/source/user-manual/upgrade-02/naspi-upgrade.rst b/site/source/user-manual/upgrade-02/naspi-upgrade.rst
new file mode 100644
index 0000000..fa136bf
--- /dev/null
+++ b/site/source/user-manual/upgrade-02/naspi-upgrade.rst
@@ -0,0 +1,10 @@
+.. _naspi-upgrade:
+
+======================================
+Upgrading from an External Drive Setup
+======================================
+
+If you already have an Embassy with an external drive, you can follow along from the `written guide appendix <https://community.start9.com/t/diy-embassy-one-geekworm-naspi-case/49>`_ and/or check out the video below:
+
+  .. youtube:: 355BENA42s8
+    :width: 100%
\ No newline at end of file