diff --git a/src/_includes/upgrade.liquid b/src/_includes/upgrade.liquid
new file mode 100644
index 0000000..4bbec81
--- /dev/null
+++ b/src/_includes/upgrade.liquid
@@ -0,0 +1,12 @@
+---
+layout: base
+title: Getting Started
+permalink: "{{ page.fileSlug }}/index.html"
+---
+
+<div class="banner">
+  <span class="secondary">Upgrade Guide</span>
+  <span>{{guideName}}</span>
+</div>
+
+{{ content }}
diff --git a/src/cm4-to-cm5-lite-migrate-nvme.html b/src/procedures/cm4-to-cm5-lite-migrate-nvme.html
similarity index 98%
rename from src/cm4-to-cm5-lite-migrate-nvme.html
rename to src/procedures/cm4-to-cm5-lite-migrate-nvme.html
index 6e1e6e4..3785a0d 100644
--- a/src/cm4-to-cm5-lite-migrate-nvme.html
+++ b/src/procedures/cm4-to-cm5-lite-migrate-nvme.html
@@ -1,5 +1,5 @@
 ---
-layout: guide
+layout: upgrade
 description: Home Assistant Yellow
 guideName: Migrating from CM4 Lite with NVMe to CM5 Lite with NVMe
 tools:
diff --git a/src/cm4-to-cm5-migrate-nvme.html b/src/procedures/cm4-to-cm5-migrate-nvme.html
similarity index 98%
rename from src/cm4-to-cm5-migrate-nvme.html
rename to src/procedures/cm4-to-cm5-migrate-nvme.html
index e2242b1..3d78ac0 100644
--- a/src/cm4-to-cm5-migrate-nvme.html
+++ b/src/procedures/cm4-to-cm5-migrate-nvme.html
@@ -1,5 +1,5 @@
 ---
-layout: guide
+layout: upgrade
 description: Home Assistant Yellow
 guideName: Migrating from CM4 with NVMe to CM5 with NVMe
 tools:
diff --git a/src/cm4-to-cm5-migrate.html b/src/procedures/cm4-to-cm5-migrate.html
similarity index 99%
rename from src/cm4-to-cm5-migrate.html
rename to src/procedures/cm4-to-cm5-migrate.html
index 14f2a79..21e4ae2 100644
--- a/src/cm4-to-cm5-migrate.html
+++ b/src/procedures/cm4-to-cm5-migrate.html
@@ -1,5 +1,5 @@
 ---
-layout: guide
+layout: upgrade
 description: Home Assistant Yellow
 guideName: Migrating from CM4 to CM5
 tools:
diff --git a/src/procedures/cm5-kit.html b/src/procedures/cm5-kit.html
index a11adf6..072306a 100644
--- a/src/procedures/cm5-kit.html
+++ b/src/procedures/cm5-kit.html
@@ -14,7 +14,7 @@
     </ul>
     <p>Additionally, make sure you have the following items which are not part of the Kit</p>
     <ul>
-      <li>Raspberry Pi Compute Module 4 (CM4)</li>
+      <li>Raspberry Pi Compute Module 5</li>
       <li>USB-C cable</li>
       <li>If you are using PoE, make sure your router or switch provides PoE on that port
         <ul>