diff --git a/site/source/user-manual/index.rst b/site/source/user-manual/index.rst
index 4b1619a..0923c30 100644
--- a/site/source/user-manual/index.rst
+++ b/site/source/user-manual/index.rst
@@ -24,4 +24,4 @@ Welcome to the EmbassyOS user manual. Here you will discover all that you Embass
   ssh
   alt-marketplaces
   device-guides/index
-  upgrade-02
+  upgrade-02/index
diff --git a/site/source/user-manual/upgrade-02/index.rst b/site/source/user-manual/upgrade-02/index.rst
new file mode 100644
index 0000000..57f070e
--- /dev/null
+++ b/site/source/user-manual/upgrade-02/index.rst
@@ -0,0 +1,40 @@
+.. _upgrade-02:
+
+====================
+Upgrading from 0.2.x
+====================
+
+.. raw:: html
+
+  <div class="topics-grid grid-container full">
+
+  <div class="grid-x grid-margin-x">
+
+.. topic-box::
+  :title: Use Upgrade Kit
+  :link: upgrade-kit
+  :icon: scylla-icon scylla-icon--getting-started
+  :class: large-5
+  :anchor: Upgrade
+
+  This is for if you purchased an upgrade kit from us
+
+.. topic-box::
+  :title: Bring your own equipment
+  :link: upgrade-diy
+  :icon: scylla-icon scylla-icon--resource-center
+  :class: large-5
+  :anchor: Upgrade
+
+  This is for if you purchased your own hardware
+
+.. raw:: html
+
+  </div></div>
+
+.. toctree::
+   :maxdepth: 2
+   :hidden:
+
+   Upgrade Kit <upgrade-kit>
+   DIY Hardware <upgrade-diy>
diff --git a/site/source/user-manual/upgrade-02.rst b/site/source/user-manual/upgrade-02/upgrade-diy.rst
similarity index 97%
rename from site/source/user-manual/upgrade-02.rst
rename to site/source/user-manual/upgrade-02/upgrade-diy.rst
index 8faa764..cf042d8 100644
--- a/site/source/user-manual/upgrade-02.rst
+++ b/site/source/user-manual/upgrade-02/upgrade-diy.rst
@@ -1,10 +1,10 @@
-.. _upgrade-02:
+.. _upgrade-diy:
 
-====================
-Upgrading from 0.2.x
-====================
+================================
+Upgrading with your own hardware
+================================
 
-This guide will cover how to upgrade from EmbassyOS version 0.2.x to version 0.3.0.
+This guide will cover how to upgrade from EmbassyOS version 0.2.x to version 0.3.0 with your own equipment.
 
 Hardware Requirements
 ---------------------
diff --git a/site/source/user-manual/upgrade-kit.rst b/site/source/user-manual/upgrade-02/upgrade-kit.rst
similarity index 99%
rename from site/source/user-manual/upgrade-kit.rst
rename to site/source/user-manual/upgrade-02/upgrade-kit.rst
index b3814ad..fd59af4 100644
--- a/site/source/user-manual/upgrade-kit.rst
+++ b/site/source/user-manual/upgrade-02/upgrade-kit.rst
@@ -7,7 +7,7 @@ Upgrading from 0.2.x with an Upgrade Kit
 This guide will cover how to upgrade from EmbassyOS version 0.2.x to version 0.3.0.
 
 .. note::
-   If you purchased your own equipment please follow :ref:`this guide<upgrade-02>`. 
+   If you purchased your own equipment please follow :ref:`this guide<upgrade-diy>`. 
 
 .. _migrate-02-instructions: