diff --git a/.gitignore b/.gitignore
index 4c46e5463..c7a652619 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,12 @@
-docs/
-!docs/CNAME
-public/
-resources/
+/content/en/docs/latest/
+/content/static/latest/
+/content/static/**/*.dtmp
+/content/static/**/*.bkp
+/content/static/**/*.crswap
+/content/static/lunr-index.json
+!/docs/CNAME
+/docs/
+/public/
+/resources/
 node_modules/
-tech-doc-hugo
-content/en/docs/latest/
-content/static/latest/
-content/static/**/*.dtmp
-content/static/**/*.bkp
-content/static/**/*.crswap
-content/static/lunr-index.json
\ No newline at end of file
+tech-doc-hugo
\ No newline at end of file
diff --git a/assets/scss/_content.scss b/assets/scss/_content.scss
index 0c79537ea..d59134b7e 100644
--- a/assets/scss/_content.scss
+++ b/assets/scss/_content.scss
@@ -184,6 +184,19 @@
         }
     }
 
+    >.scribe-video {
+        max-width: 640px;
+        width: 100%;
+        animation: fadeIn 2s;
+
+        iframe {
+            height: 640px;
+            width: 100%;
+            aspect-ratio: 16 / 9;
+            border-radius: 5px;
+        }
+    }
+
     br {
         content: " ";
         display: block;
diff --git a/content/en/blog/releases/2025.X/2025.1.md b/content/en/blog/releases/2025.X/2025.1.md
index 3b10f5bb0..7df28966a 100644
--- a/content/en/blog/releases/2025.X/2025.1.md
+++ b/content/en/blog/releases/2025.X/2025.1.md
@@ -503,8 +503,8 @@ Releases are currently forecast to be made available on:
 [Adding Innovation to a 7.2 Installation - Single Server - Without HA]: {{< url path="Cortex.GettingStarted.OnPremise.AddInnovationTo72.SingleServerWithoutHA.MainDoc" version="2025.1" >}}
 [Adding Innovation to a 7.2 Installation - Multiple Server - With HA]: {{< url path="Cortex.GettingStarted.OnPremise.AddInnovationTo72.MultipleServerWithHA.MainDoc" version="2025.1" >}}
 
-[Upgrade - Single Server - Without HA]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.MainDoc" version="2025.1" >}}
-[Upgrade - Multiple Server - With HA]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.MainDoc" version="2025.1" >}}
+[Upgrade - Single Server - Without HA]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.MainDoc" version="2025.1" >}}
+[Upgrade - Multiple Server - With HA]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.MainDoc" version="2025.1" >}}
 [Potential Breaking - Redesigned Semaphore API]: {{< ref "#redesigned-semaphore-api-1" >}}
 
 [{{% ctx %}} Studio]: {{< url path="Cortex.Guides.Studio.MainDoc" version="2025.1" >}}
diff --git a/content/en/docs/2025.1/Guides/cortex-gateway/_index.md b/content/en/docs/2025.1/Guides/cortex-gateway/_index.md
index b5fa856c1..ff99ab5be 100644
--- a/content/en/docs/2025.1/Guides/cortex-gateway/_index.md
+++ b/content/en/docs/2025.1/Guides/cortex-gateway/_index.md
@@ -2,7 +2,7 @@
 title: "CORTEX Gateway"
 linkTitle: "CORTEX Gateway"
 description: "The centralised web-based portal for accessing all user applications and tooling in the {{% ctx %}} platform."
-weight: 1
+weight: 50
 ---
 
 {{< workinprogress >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-guides/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/_index.md
new file mode 100644
index 000000000..bcfe82c73
--- /dev/null
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Upgrade Guides"
+linkTitle: "Upgrade Guides"
+description: "This section includes all upgrade guides for the {{% ctx %}} platform."
+weight: 25
+---
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/try-it-out.md
similarity index 77%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/try-it-out.md
index 5a8a0e4d3..680c88347 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/multi-server/test-executing-production-flows.md" >}}
 
-[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
similarity index 97%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
index 7aa892b26..df2c861c6 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
@@ -62,4 +62,4 @@ This guide describes how to upgrade the Application Servers and Load Balancer Se
 
 1. [Upgrade Web Application Server][]
 
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/_index.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/_index.md
index 956ddc1d6..b1e85b574 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/_index.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/_index.md
@@ -7,4 +7,4 @@ weight: 40
 
 This guide describes how to upgrade the Web Application Server. Please ensure that [Upgrade Application Servers and Load Balancer][] has been completed before starting this installation. These steps assume that the v2024.1 version of Gateway and its prerequisites have already been installed.
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
index 97990aab4..40d16508d 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
@@ -26,5 +26,5 @@ Please ensure that [Upgrade Application Servers and Load Balancer][] has been co
 
 1. [Upgrade Flow Debugger][]
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeDebugger" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeDebugger" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
similarity index 85%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
index e896f3e3a..c9954c1ff 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
@@ -29,4 +29,4 @@ This guide describes how to upgrade the Flow Debugger on the Web Application Ser
 
 1. [Upgrade Gateway][]
 
-[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeGateway" >}}
+[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeGateway" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
similarity index 73%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
index e13598a03..3f09e3593 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
@@ -25,5 +25,5 @@ This guide describes how to upgrade {{% ctx %}} Gateway from 2024.1 to 2024.3. P
 
 1. [Try It Out][]
 
-[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeDebugger" >}}
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.TryItOut" >}}
+[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.UpgradeDebugger" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA.TryItOut" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/try-it-out.md
similarity index 79%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/try-it-out.md
index 05aa5aa36..ba151f2ee 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/single-server/test-executing-production-flows.md" >}}
 
-[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.UpgradeApplicationServer" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
\ No newline at end of file
+[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
\ No newline at end of file
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-application-server.md
similarity index 91%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-application-server.md
index 4f698ff4c..d2cc638c9 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-application-server.md
@@ -33,5 +33,5 @@ This guide describes how to upgrade the Application Server components on the ser
 
 1. [Upgrade Web Application Server][]
 
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
 
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-web-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-web-application-server.md
similarity index 84%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-web-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-web-application-server.md
index 7757a353f..10427cf40 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-web-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-web-application-server.md
@@ -34,5 +34,5 @@ This guide describes how to upgrade {{% ctx %}} Gateway from 2024.1 to 2024.3. P
 
 1. [Try It Out][]
 
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.TryItOut" >}}
-[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.TryItOut" >}}
+[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA.UpgradeApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/pre-upgrade.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/pre-upgrade.md
similarity index 79%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/pre-upgrade.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/pre-upgrade.md
index 1aa1743f9..449a7da31 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/pre-upgrade.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/pre-upgrade.md
@@ -17,4 +17,4 @@ This guide describes how to perform the steps required before starting the upgra
 
 1. [Upgrade][]
 
-[Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.Upgrade" >}}
+[Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.Upgrade" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/try-it-out.md
similarity index 79%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/try-it-out.md
index e2cae4a21..acb2ea382 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/try-it-out.md
@@ -21,5 +21,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/multi-server/test-executing-production-flows.md" >}}
 
-[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/_index.md
similarity index 72%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/_index.md
index 5642c08be..ba8ce121e 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/_index.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/_index.md
@@ -7,4 +7,4 @@ weight: 40
 
 This guide describes how to upgrade {{% ctx %}}. Please ensure that the [Pre-Upgrade][PreUpgrade] steps have been completed before starting the upgrade.
 
-[PreUpgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.PreUpgrade" >}}
+[PreUpgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.PreUpgrade" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-application-and-loadbalancer-servers.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-application-and-loadbalancer-servers.md
similarity index 95%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-application-and-loadbalancer-servers.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-application-and-loadbalancer-servers.md
index 3c238d846..8788ad2ec 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-application-and-loadbalancer-servers.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-application-and-loadbalancer-servers.md
@@ -67,5 +67,5 @@ To check the previous configuration values open the `Cortex.Upgrade.ApplicationC
 
 1. [Upgrade Web Application Server][]
 
-[PreUpgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.PreUpgrade" >}}
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[PreUpgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.PreUpgrade" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/_index.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/_index.md
index bea994a0f..d16f74e54 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/_index.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/_index.md
@@ -7,4 +7,4 @@ weight: 40
 
 This guide describes how to upgrade the Web Application Server. Please ensure that [Upgrade Application Servers and Load Balancer][] has been completed before starting this installation. These steps assume that the v2024.11 version of Gateway and its prerequisites have already been installed.
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-debugger.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-debugger.md
similarity index 79%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-debugger.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-debugger.md
index 6d8560ef3..2f62a0162 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-debugger.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-debugger.md
@@ -29,5 +29,5 @@ This guide describes how to upgrade the Flow Debugger on the Web Application Ser
 
 1. [Upgrade Gateway][]
 
-[Upgrade Application and Load Balancer Servers]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeGateway" >}}
+[Upgrade Application and Load Balancer Servers]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeGateway" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-gateway.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-gateway.md
similarity index 76%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-gateway.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-gateway.md
index fd1428873..4ed7719c2 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-gateway.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-gateway.md
@@ -29,5 +29,5 @@ This guide describes how to upgrade {{% ctx %}} Gateway from 2024.11 to 2025.1.
 
 1. [Try It Out][]
 
-[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeDebugger" >}}
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.TryItOut" >}}
+[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.UpgradeDebugger" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA.TryItOut" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/pre-upgrade.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/pre-upgrade.md
similarity index 79%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/pre-upgrade.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/pre-upgrade.md
index e3018a9a0..d6314e55e 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/pre-upgrade.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/pre-upgrade.md
@@ -17,4 +17,4 @@ This guide describes how to perform the steps required before starting the upgra
 
 1. [Upgrade][]
 
-[Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.Upgrade" >}}
+[Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.Upgrade" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/try-it-out.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/try-it-out.md
index 6d3e19ad4..6cc05b01b 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/try-it-out.md
@@ -21,5 +21,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/single-server/test-executing-production-flows.md" >}}
 
-[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.UpgradeApplicationServer" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/_index.md
similarity index 72%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/_index.md
index efb6dc1bf..1783c4117 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/_index.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/_index.md
@@ -7,4 +7,4 @@ weight: 40
 
 This guide describes how to upgrade {{% ctx %}}. Please ensure that the [Pre-Upgrade][PreUpgrade] steps have been completed before starting the upgrade.
 
-[PreUpgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.PreUpgrade" >}}
+[PreUpgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.PreUpgrade" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-application-server.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-application-server.md
index 948d05f0c..ff89fad64 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-application-server.md
@@ -29,5 +29,5 @@ This guide describes how to upgrade the Application Server components on the ser
 
 1. [Upgrade Web Application Server][]
 
-[PreUpgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.PreUpgrade" >}}
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[PreUpgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.PreUpgrade" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-web-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-web-application-server.md
similarity index 82%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-web-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-web-application-server.md
index 6de4c4d1e..2dbae4bbc 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-web-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-web-application-server.md
@@ -29,5 +29,5 @@ This guide describes how to upgrade {{% ctx %}} Gateway from 2024.11 to 2025.1.
 
 1. [Try It Out][]
 
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.TryItOut" >}}
-[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.TryItOut" >}}
+[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA.UpgradeApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/try-it-out.md
similarity index 77%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/try-it-out.md
index df5e453b7..c53184c6b 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/multi-server/test-executing-production-flows.md" >}}
 
-[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
similarity index 97%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
index 2b7972aa8..192f80b2f 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
@@ -62,4 +62,4 @@ This guide describes how to upgrade the Application Servers and Load Balancer Se
 
 1. [Upgrade Web Application Server][]
 
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/_index.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/_index.md
index d935713ea..b461808a0 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/_index.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/_index.md
@@ -7,4 +7,4 @@ weight: 40
 
 This guide describes how to upgrade the Web Application Server. Please ensure that [Upgrade Application Servers and Load Balancer][] has been completed before starting this installation. These steps assume that the v2024.3 version of Gateway and its prerequisites have already been installed.
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
index d749f6f71..32683f148 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
@@ -26,5 +26,5 @@ Please ensure that [Upgrade Application Servers and Load Balancer][] has been co
 
 1. [Upgrade Flow Debugger][]
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeDebugger" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeDebugger" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
similarity index 85%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
index cdf7307cc..1b36e3787 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
@@ -29,4 +29,4 @@ This guide describes how to upgrade the Flow Debugger on the Web Application Ser
 
 1. [Upgrade Gateway][]
 
-[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeGateway" >}}
+[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeGateway" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
similarity index 73%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
index 92748ba31..6a141f802 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
@@ -25,5 +25,5 @@ This guide describes how to upgrade {{% ctx %}} Gateway from 2024.3 to 2024.5. P
 
 1. [Try It Out][]
 
-[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeDebugger" >}}
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.TryItOut" >}}
+[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.UpgradeDebugger" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA.TryItOut" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/try-it-out.md
similarity index 79%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/try-it-out.md
index e6deaefdb..8dd739870 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/single-server/test-executing-production-flows.md" >}}
 
-[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.UpgradeApplicationServer" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
\ No newline at end of file
+[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
\ No newline at end of file
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-application-server.md
similarity index 91%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-application-server.md
index a378b3b86..bd941c4c7 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-application-server.md
@@ -33,5 +33,5 @@ This guide describes how to upgrade the Application Server components on the ser
 
 1. [Upgrade Web Application Server][]
 
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
 
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-web-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-web-application-server.md
similarity index 84%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-web-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-web-application-server.md
index 2011d979e..d60c4285e 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-web-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-web-application-server.md
@@ -34,5 +34,5 @@ This guide describes how to upgrade {{% ctx %}} Gateway from 2024.3 to 2024.5. P
 
 1. [Try It Out][]
 
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.TryItOut" >}}
-[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.TryItOut" >}}
+[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA.UpgradeApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/try-it-out.md
similarity index 77%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/try-it-out.md
index f2dd5df57..904d5bea9 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/multi-server/test-executing-production-flows.md" >}}
 
-[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
similarity index 97%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
index 61d52ecd6..e7051d19a 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
@@ -76,4 +76,4 @@ To check the previous configuration values open the `Cortex.Upgrade.ApplicationC
 
 1. [Upgrade Web Application Server][]
 
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/_index.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/_index.md
index 82bc958cb..0a128ba4a 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/_index.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/_index.md
@@ -7,4 +7,4 @@ weight: 40
 
 This guide describes how to upgrade the Web Application Server. Please ensure that [Upgrade Application Servers and Load Balancer][] has been completed before starting this installation. These steps assume that the v2024.5 version of Gateway and its prerequisites have already been installed.
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
similarity index 83%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
index 5645bd0eb..fd26c1104 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
@@ -28,5 +28,5 @@ Please ensure that [Upgrade Application Servers and Load Balancer][] has been co
 
 1. [Upgrade Flow Debugger][]
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeDebugger" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeDebugger" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
similarity index 85%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
index a0bd3fc93..df756ce3d 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
@@ -29,4 +29,4 @@ This guide describes how to upgrade the Flow Debugger on the Web Application Ser
 
 1. [Upgrade Gateway][]
 
-[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeGateway" >}}
+[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeGateway" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
similarity index 78%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
index 813475bf1..6155900de 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
@@ -33,5 +33,5 @@ If the {{% ctx %}} Interaction Portal is used in your environment, you must also
 
 1. [Try It Out][]
 
-[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeDebugger" >}}
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.TryItOut" >}}
+[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.UpgradeDebugger" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA.TryItOut" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/try-it-out.md
similarity index 79%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/try-it-out.md
index 4577a2be6..17522fd6c 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/single-server/test-executing-production-flows.md" >}}
 
-[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.UpgradeApplicationServer" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-application-server.md
similarity index 91%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-application-server.md
index 6f25888bf..bef346f6f 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-application-server.md
@@ -33,5 +33,5 @@ This guide describes how to upgrade the Application Server components on the ser
 
 1. [Upgrade Web Application Server][]
 
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
 
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-web-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-web-application-server.md
similarity index 88%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-web-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-web-application-server.md
index 947a007c9..5fd8fdcce 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-web-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-web-application-server.md
@@ -44,5 +44,5 @@ If the {{% ctx %}} Interaction Portal is used in your environment, you must also
 
 1. [Try It Out][]
 
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.TryItOut" >}}
-[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.TryItOut" >}}
+[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA.UpgradeApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/try-it-out.md
similarity index 77%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/try-it-out.md
index 8750d3ba8..8aa0cdd01 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/multi-server/test-executing-production-flows.md" >}}
 
-[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
similarity index 97%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
index 7f23a7095..0b010de3d 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
@@ -76,4 +76,4 @@ To check the previous configuration values open the `Cortex.Upgrade.ApplicationC
 
 1. [Upgrade Web Application Server][]
 
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/_index.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/_index.md
index ec4c6a59d..7fb2a7aa1 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/_index.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/_index.md
@@ -7,4 +7,4 @@ weight: 40
 
 This guide describes how to upgrade the Web Application Server. Please ensure that [Upgrade Application Servers and Load Balancer][] has been completed before starting this installation. These steps assume that the v2024.7 version of Gateway and its prerequisites have already been installed.
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
index fbbadcc08..d686dedb3 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
@@ -26,5 +26,5 @@ Please ensure that [Upgrade Application Servers and Load Balancer][] has been co
 
 1. [Upgrade Flow Debugger][]
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeDebugger" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeDebugger" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
similarity index 75%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
index e79dc6f38..f303ed429 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
@@ -29,5 +29,5 @@ This guide describes how to upgrade the Flow Debugger on the Web Application Ser
 
 1. [Upgrade Gateway][]
 
-[prerequisites]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.WebApplicationServerPreqrequisites" >}}
-[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeGateway" >}}
+[prerequisites]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.WebApplicationServerPreqrequisites" >}}
+[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeGateway" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
similarity index 93%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
index c10bf9752..32fde9b32 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
@@ -55,5 +55,5 @@ Repeat the above instructions for the  `Flow Debugger`. In step 2 `server.domain
 
 1. [Try It Out][]
 
-[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeDebugger" >}}
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.TryItOut" >}}
+[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.UpgradeDebugger" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA.TryItOut" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/try-it-out.md
similarity index 79%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/try-it-out.md
index de31c3621..279463428 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/single-server/test-executing-production-flows.md" >}}
 
-[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.UpgradeApplicationServer" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-application-server.md
similarity index 91%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-application-server.md
index c2e76965f..5a33fdbed 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-application-server.md
@@ -33,5 +33,5 @@ This guide describes how to upgrade the Application Server components on the ser
 
 1. [Upgrade Web Application Server][]
 
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
 
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-web-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-web-application-server.md
similarity index 94%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-web-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-web-application-server.md
index e4fc5c5ca..9395b88bb 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-web-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-web-application-server.md
@@ -60,5 +60,5 @@ This guide describes how to upgrade {{% ctx %}} Gateway from 2024.7 to 2024.9. P
 
 1. [Try It Out][]
 
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.TryItOut" >}}
-[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.TryItOut" >}}
+[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA.UpgradeApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/prerequisites.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/prerequisites.md
similarity index 90%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/prerequisites.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/prerequisites.md
index e47de36dc..66087e269 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/prerequisites.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/prerequisites.md
@@ -56,5 +56,5 @@ On the Load Balancer Server:
 
 1. [Upgrade Application Servers and Load Balancer][]
 
-[Retrieve Existing Encryption Key]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.RetrieveAppServerEncryptionKey" >}}
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Retrieve Existing Encryption Key]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.RetrieveAppServerEncryptionKey" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/try-it-out.md
similarity index 77%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/try-it-out.md
index aed628acf..2db2f5528 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/multi-server/test-executing-production-flows.md" >}}
 
-[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Application Servers and Load Balancer Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
similarity index 95%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
index e87322dd3..e4dfc10c2 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers.md
@@ -76,5 +76,5 @@ To check the previous configuration values open the `Cortex.Upgrade.ApplicationC
 
 1. [Upgrade Web Application Server][]
 
-[Prerequisites]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.Prerequisites" >}}
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
+[Prerequisites]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.Prerequisites" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/_index.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/_index.md
index 08f3e4269..900cc818d 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/_index.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/_index.md
@@ -7,4 +7,4 @@ weight: 40
 
 This guide describes how to upgrade the Web Application Server. Please ensure that [Upgrade Application Servers and Load Balancer][] has been completed before starting this installation. These steps assume that the v2024.9 version of Gateway and its prerequisites have already been installed.
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
similarity index 81%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
index 7416f7ac8..804350676 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/prerequisites.md
@@ -26,5 +26,5 @@ Please ensure that [Upgrade Application Servers and Load Balancer][] has been co
 
 1. [Upgrade Flow Debugger][]
 
-[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
-[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeDebugger" >}}
+[Upgrade Application Servers and Load Balancer]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeApplicationAndLoadBalancerServers" >}}
+[Upgrade Flow Debugger]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeDebugger" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
similarity index 75%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
index cd6767e96..841b3960a 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger.md
@@ -29,5 +29,5 @@ This guide describes how to upgrade the Flow Debugger on the Web Application Ser
 
 1. [Upgrade Gateway][]
 
-[prerequisites]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.WebApplicationServerPreqrequisites" >}}
-[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeGateway" >}}
+[prerequisites]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.WebApplicationServerPreqrequisites" >}}
+[Upgrade Gateway]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeGateway" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
similarity index 76%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
index 9e7c99a18..1dc507599 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway.md
@@ -29,5 +29,5 @@ This guide describes how to upgrade {{% ctx %}} Gateway from 2024.9 to 2024.11.
 
 1. [Try It Out][]
 
-[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeDebugger" >}}
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.TryItOut" >}}
+[Flow Debugger upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.UpgradeDebugger" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA.TryItOut" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/try-it-out.md
similarity index 79%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/try-it-out.md
index 89ee414ef..05d4dacc6 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/try-it-out.md
@@ -15,5 +15,5 @@ This guide describes how to try out an upgraded {{% ctx %}} to make sure it is w
 
 {{< section "/upgrade/try-it-out/single-server/test-executing-production-flows.md" >}}
 
-[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.UpgradeApplicationServer" >}}
-[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Web Application Server Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-application-server.md
similarity index 91%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-application-server.md
index 96f9a427c..75dc7970b 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-application-server.md
@@ -33,5 +33,5 @@ This guide describes how to upgrade the Application Server components on the ser
 
 1. [Upgrade Web Application Server][]
 
-[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
+[Upgrade Web Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.UpgradeWebApplicationServer" >}}
 
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-web-application-server.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-web-application-server.md
similarity index 86%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-web-application-server.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-web-application-server.md
index 9cf81ec0d..a2fb7689c 100644
--- a/content/en/docs/2025.1/Guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-web-application-server.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-web-application-server.md
@@ -38,5 +38,5 @@ This guide describes how to upgrade {{% ctx %}} Gateway from 2024.9 to 2024.11.
 
 1. [Try It Out][]
 
-[Try It Out]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.TryItOut" >}}
-[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.UpgradeApplicationServer" >}}
+[Try It Out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.TryItOut" >}}
+[Upgrade Application Server]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA.UpgradeApplicationServer" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/advanced/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/advanced/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/advanced/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/advanced/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/advanced/ssl-best-practices.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/advanced/ssl-best-practices.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/advanced/ssl-best-practices.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/advanced/ssl-best-practices.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-cortex/advanced/upgrade-flows.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/advanced/upgrade-flows.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-cortex/advanced/upgrade-flows.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-cortex/advanced/upgrade-flows.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-observability/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/cloud/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-observability/cloud/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/prerequisites.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/prerequisites.md
similarity index 93%
rename from content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/prerequisites.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/prerequisites.md
index d141133bc..c18493cd6 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/prerequisites.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/prerequisites.md
@@ -41,4 +41,4 @@ On each Application Server that Promtail is installed on:
 
 [Promtail 3.0.0]:  {{< url path="Grafana.SelfManaged.Downloads.Promtail.3.0.0.PromtailInstallZip" >}}
 [Promtail Install]: {{< url path="GitHub.Cortex.Observability.3.0.0.PromtailInstallZip" >}}
-[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeObservability.Cloud.Grafana.UpgradePromtail" >}}
+[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana.UpgradePromtail" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/try-it-out.md
similarity index 92%
rename from content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/try-it-out.md
index f6d53e219..f20acc5a7 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/try-it-out.md
@@ -44,5 +44,5 @@ If other requests have been made then there may be more than one request visible
 If other requests have been made then there may be more than one request visible on the dashboard.
 {{% / alert %}}
 
-[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeObservability.Cloud.Grafana.UpgradePromtail" >}}
-[verifying the old version]: {{< url path="Cortex.Guides.UpgradeObservability.Cloud.Grafana.VerifyOldVersion" >}}
+[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana.UpgradePromtail" >}}
+[verifying the old version]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana.VerifyOldVersion" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/upgrade-promtail.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/upgrade-promtail.md
similarity index 86%
rename from content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/upgrade-promtail.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/upgrade-promtail.md
index 001236749..5134badd9 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/cloud/grafana/upgrade-promtail.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/cloud/grafana/upgrade-promtail.md
@@ -69,7 +69,7 @@ These steps will need to be performed on all application servers that host a Pro
 
 1. [Try it out][]
 
-[backed up]: {{< url path="Cortex.Guides.UpgradeObservability.Cloud.Grafana.BackupOldFiles" >}}
-[Make Artefacts Available]: {{< url path="Cortex.Guides.UpgradeObservability.Cloud.Grafana.MakeArtefactsAvailable" >}}
-[Prerequisites]: {{< url path="Cortex.Guides.UpgradeObservability.Cloud.Grafana.Prerequisites" >}}
-[Try it out]: {{< url path="Cortex.Guides.UpgradeObservability.Cloud.Grafana.TryItOut" >}}
+[backed up]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana.BackupOldFiles" >}}
+[Make Artefacts Available]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana.MakeArtefactsAvailable" >}}
+[Prerequisites]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana.Prerequisites" >}}
+[Try it out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana.TryItOut" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/dashboards/Grafana/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/Grafana/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-observability/dashboards/Grafana/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/Grafana/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/dashboards/Grafana/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/Grafana/try-it-out.md
similarity index 89%
rename from content/en/docs/2025.1/Guides/upgrade-observability/dashboards/Grafana/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/Grafana/try-it-out.md
index 09b163023..89ed5c56f 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/dashboards/Grafana/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/Grafana/try-it-out.md
@@ -32,5 +32,5 @@ If other requests have been made then there may be more than one request visible
 If other requests have been made then there may be more than one request visible on the dashboard.
 {{% / alert %}}
 
-[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeObservability.Cloud.Grafana.UpgradePromtail" >}}
-[verifying the old version]: {{< url path="Cortex.Guides.UpgradeObservability.Cloud.Grafana.VerifyOldVersion" >}}
+[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana.UpgradePromtail" >}}
+[verifying the old version]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana.VerifyOldVersion" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/dashboards/Grafana/upgrade-dashboards.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/Grafana/upgrade-dashboards.md
similarity index 87%
rename from content/en/docs/2025.1/Guides/upgrade-observability/dashboards/Grafana/upgrade-dashboards.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/Grafana/upgrade-dashboards.md
index 0e376d0eb..f8a8e3de5 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/dashboards/Grafana/upgrade-dashboards.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/Grafana/upgrade-dashboards.md
@@ -35,6 +35,6 @@ You will receive warnings that *A dashboard or folder with the same name already
 
 1. [Try it out][]
 
-[extracted]: {{< url path="Cortex.Guides.UpgradeObservability.Dashboards.Grafana.Download" >}}
+[extracted]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Dashboards.Grafana.Download" >}}
 [Grafana.Dashboards.zip]: {{< url path="GitHub.Cortex.Observability.3.0.0.GrafanaDashboardsZip" >}}
-[Try it out]: {{< url path="Cortex.Guides.UpgradeObservability.Dashboards.Grafana.TryItOut" >}}
+[Try it out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.Dashboards.Grafana.TryItOut" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/dashboards/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-observability/dashboards/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/dashboards/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-observability/on-premise/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/_index.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/_index.md
similarity index 100%
rename from content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/_index.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/_index.md
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/prerequisites.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/prerequisites.md
similarity index 96%
rename from content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/prerequisites.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/prerequisites.md
index 1a7dbf3e1..2c5be1dad 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/prerequisites.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/prerequisites.md
@@ -57,4 +57,4 @@ weight: 1
 [Grafana Loki Install]: {{< url path="GitHub.Cortex.Observability.3.0.0.GrafanaLokiInstallZip" >}}
 [Promtail 3.0.0]:  {{< url path="Grafana.SelfManaged.Downloads.Promtail.3.0.0.PromtailInstallZip" >}}
 [Promtail Install]: {{< url path="GitHub.Cortex.Observability.3.0.0.PromtailInstallZip" >}}
-[Upgrade Grafana]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.UpgradeGrafana" >}}
+[Upgrade Grafana]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.UpgradeGrafana" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/try-it-out.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/try-it-out.md
similarity index 92%
rename from content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/try-it-out.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/try-it-out.md
index 3f46dd3c6..d768e16d3 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/try-it-out.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/try-it-out.md
@@ -50,5 +50,5 @@ If other requests have been made then there may be more than one request visible
 If other requests have been made then there may be more than one request visible on the dashboard.
 {{% / alert %}}
 
-[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.UpgradePromtail" >}}
-[verifying the old version]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.VerifyOldVersion" >}}
+[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.UpgradePromtail" >}}
+[verifying the old version]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.VerifyOldVersion" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/upgrade-grafana.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-grafana.md
similarity index 73%
rename from content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/upgrade-grafana.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-grafana.md
index c60d9a272..aadb72a7b 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/upgrade-grafana.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-grafana.md
@@ -25,7 +25,7 @@ This guide describes how to upgrade the Grafana installation. Please ensure that
 
 1. [Upgrade Loki][]
 
-[backed up]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.BackupOldFiles" >}}
-[Make Artefacts Available]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.MakeArtefactsAvailable" >}}
-[Prerequisites]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.Prerequisites" >}}
-[Upgrade Loki]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.UpgradeLoki" >}}
+[backed up]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.BackupOldFiles" >}}
+[Make Artefacts Available]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.MakeArtefactsAvailable" >}}
+[Prerequisites]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.Prerequisites" >}}
+[Upgrade Loki]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.UpgradeLoki" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/upgrade-loki.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-loki.md
similarity index 87%
rename from content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/upgrade-loki.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-loki.md
index 8da4dd9db..2596b9b69 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/upgrade-loki.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-loki.md
@@ -87,7 +87,7 @@ This guide describes how to upgrade the Loki installation. Please ensure that th
 
 1. [Upgrade Promtail][]
 
-[backed up]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.BackupOldFiles" >}}
-[Grafana Upgrade]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.UpgradeGrafana" >}}
-[Make Artefacts Available]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.MakeArtefactsAvailable" >}}
-[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.UpgradePromtail" >}}
+[backed up]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.BackupOldFiles" >}}
+[Grafana Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.UpgradeGrafana" >}}
+[Make Artefacts Available]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.MakeArtefactsAvailable" >}}
+[Upgrade Promtail]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.UpgradePromtail" >}}
diff --git a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/upgrade-promtail.md b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-promtail.md
similarity index 85%
rename from content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/upgrade-promtail.md
rename to content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-promtail.md
index 267e2e10b..014a7b960 100644
--- a/content/en/docs/2025.1/Guides/upgrade-observability/on-premise/grafana/upgrade-promtail.md
+++ b/content/en/docs/2025.1/Guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-promtail.md
@@ -69,7 +69,7 @@ These steps will need to be performed on all application servers that host a Pro
 
 1. [Try it out][]
 
-[backed up]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.BackupOldFiles" >}}
-[Loki Upgrade]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.UpgradeLoki" >}}
-[Make Artefacts Available]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.MakeArtefactsAvailable" >}}
-[Try it out]: {{< url path="Cortex.Guides.UpgradeObservability.OnPremise.Grafana.TryItOut" >}}
+[backed up]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.BackupOldFiles" >}}
+[Loki Upgrade]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.UpgradeLoki" >}}
+[Make Artefacts Available]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.MakeArtefactsAvailable" >}}
+[Try it out]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana.TryItOut" >}}
diff --git a/content/en/docs/2025.1/Guides/user-guides/_index.md b/content/en/docs/2025.1/Guides/user-guides/_index.md
new file mode 100644
index 000000000..1b1968cf4
--- /dev/null
+++ b/content/en/docs/2025.1/Guides/user-guides/_index.md
@@ -0,0 +1,6 @@
+---
+title: "User Guides"
+linkTitle: "User Guides"
+description: "This section includes user guides for the {{% ctx %}} platform."
+weight: 1
+---
diff --git a/content/en/docs/2025.1/Guides/user-guides/user-interfaces/_index.md b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/_index.md
new file mode 100644
index 000000000..ede6dfbf2
--- /dev/null
+++ b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/_index.md
@@ -0,0 +1,6 @@
+---
+title: "User Interfaces"
+linkTitle: "User Interfaces"
+description: "This section includes user guides related to the {{% ctx %}} User Interfaces."
+weight: 10
+---
diff --git a/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/_index.md b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/_index.md
new file mode 100644
index 000000000..50b814718
--- /dev/null
+++ b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Admin"
+linkTitle: "Admin"
+description: "This section includes user guides related to the Admin section in {{% ctx %}} Gateway."
+weight: 10
+---
diff --git a/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/_index.md b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/_index.md
new file mode 100644
index 000000000..6ac52ff9f
--- /dev/null
+++ b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Packages"
+linkTitle: "Packages"
+description: "This section includes user guides related to Package Management in {{% ctx %}} Gateway."
+weight: 10
+---
diff --git a/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/overview.md b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/overview.md
new file mode 100644
index 000000000..5ac921395
--- /dev/null
+++ b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/overview.md
@@ -0,0 +1,64 @@
+---
+title: "Overview"
+linkTitle: "Overview"
+description: "Summary and anatomy of Package Management"
+weight: 1
+---
+
+# {{% param title %}}
+
+## Summary
+
+The Package Management page allows you to manage [{{% ctx %}} packages][What is a Package?], including creating and publishing them.
+
+|                              |                                                                 |
+|------------------------------|-----------------------------------------------------------------|
+| **Roles Required:**          | Admin                                                           |
+
+## Anatomy
+
+{{< figure src="/images/Package Management.png" title="Package Management" >}}
+
+The Package Management page displays a list of existing {{% ctx %}} Package definitions in the [Package Definitions Grid][], showing the most recently created version of each package; older versions can be viewed by expanding the package definition.
+
+Selecting a package version will display it in the [Package Version Editor][]; the Definition tab will be selected, displaying the flows it contains and buttons to:
+
+* [Export][] the selected package version to a {{% ctx %}} Package file.
+* [Create New Version][] of the package based on the selected package version.
+* [Publish][] or [Unpublish][] the package version to the {{% ctx %}} Execution Services.
+* [Set As Default Package][] enabling flows to be executed from all versions of this package without specifying the package name in the execution REST Request.
+* [Set As Default Version][] enabling flows to be executed from the package version without specifying the package version in the execution REST Request.
+
+The [Package Version Editor][] contains the following tabs:
+
+* [Definition][] - displays the flows contained in this package version.
+* [Authorisation][] - allows the selection of LDAP groups authorised to execute flows contained in this package version.
+* [Schedules][] – allows configuration of schedules to automatically execute flows contained in this package version at defined times or intervals.
+* [Triggers][] - allows configuration of SNMP triggers to automatically execute flows contained in this package version on receipt of SNMP traps.
+* [Running Executions][] - displays a list of running executions of flows in this package version and enables the user to abort them.
+
+## See Also
+
+### Related Concepts
+
+* [What is a Package?][]
+
+### Related Tutorials
+
+* [Package Management][]
+
+[Authorisation]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Authorisation" >}}
+[Create New Version]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.CreateNewVersion" >}}
+[Definition]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Definition" >}}
+[Export]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Export" >}}
+[Package Definitions Grid]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageDefinitionsGrid.MainDoc" >}}
+[Package Management]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.MainDoc" >}}
+[Package Version Editor]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.MainDoc" >}}
+[Publish]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Publish" >}}
+[Running Executions]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.RunningExecutions" >}}
+[Schedules]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Schedules" >}}
+[Set As Default Package]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.SetDefaultPackage" >}}
+[Set As Default Version]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.SetDefaultVersion" >}}
+[Triggers]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Triggers" >}}
+[Unpublish]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Unpublish" >}}
+[What is a Package?]: {{< url path="Cortex.Reference.Concepts.Fundamentals.Packages.WhatIsAPackage.MainDoc" >}}
diff --git a/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/package-definitions-grid.md b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/package-definitions-grid.md
new file mode 100644
index 000000000..fb6c19e48
--- /dev/null
+++ b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/package-definitions-grid.md
@@ -0,0 +1,74 @@
+---
+title: "Package Definitions Grid"
+linkTitle: "Package Definitions Grid"
+description: "Summary and anatomy of the Package Definitions Grid"
+weight: 10
+---
+
+# {{% param title %}}
+
+## Summary
+
+The Package Definitions Grid displays a list of existing [{{% ctx %}} Package][What is a Package?] definitions.
+
+## Anatomy
+
+{{< figure src="/images/Package Definitions Grid.png" title="Package Definitions Grid" >}}
+
+The Package Definitions Grid shows the most recently created version of each package; older versions can be viewed by expanding the package definition. Selecting a package version will display it's details in the [Package Version Editor][].
+
+The Package Definitions Grid also contains buttons to:
+
+* [Create a Package][]
+* [Import a Package][]
+
+## Actions
+
+### Create a Package
+
+A new package is created by clicking the `Add Package Definition` button, supplying a Package Name and selecting the flows to be included in the package.
+
+The Package Name must be unique and can only contain alphanumeric characters, hyphens and underscores. The flows added to the package definition are the Master Versions of the flows contained in the Master Repository (most recently committed flow version).
+
+If a selected flow has dependent flows, the dependent flow will be automatically selected for inclusion in the package; dependent flows cannot be manually deselected for inclusion; this ensures packages contain all required dependencies.
+
+The package may optionally [define LDAP groups][Authorisation] that can execute flows, [schedules][] to run flows at specific times, and [triggers][] to run flows on receipt of specific SNMP Traps.
+
+See the [Create a Package][Create a Package tutorial] tutorial for a step-by-step guide.
+
+### Import a Package
+
+A {{% ctx %}} Package file, with the extension of `.ctxpkg`, may be imported into any {{% ctx %}} Gateway by clicking the `Import` button and selecting the `.ctxpkg` file to import.
+
+If the imported package already exists in {{% ctx %}} Gateway, a new version of that package will be created; if the imported package does not exist, a new package will be created.
+
+All the flows contained in the package will be saved in the Master Repository of the destination {{% ctx %}} Gateway as the master versions of those flows; if the imported flows already existed, the imported flows would become the new master versions.
+
+See the [Import a Package][Import a Package tutorial] tutorial for a step-by-step guide.
+
+## Remarks
+
+### Known Limitations
+
+* Flow versions other than the master versions stored in the Master Repository cannot be included in a new package.
+
+## See Also
+
+### Related Concepts
+
+* [What is a Package?][]
+
+### Related Tutorials
+
+* [Create a Package][Create a Package tutorial]
+* [Import a Package][Import a Package tutorial]
+
+[Create a Package]: {{< ref "#create-a-package" >}}
+[Create a Package tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.CreatePackage" >}}
+[Authorisation]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Authorisation" >}}
+[Import a Package]: {{< ref "#import-a-package" >}}
+[Import a Package tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.ImportPackage" >}}
+[Package Version Editor]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.MainDoc" >}}
+[schedules]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Schedules" >}}
+[triggers]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Triggers" >}}
+[What is a Package?]: {{< url path="Cortex.Reference.Concepts.Fundamentals.Packages.WhatIsAPackage.MainDoc" >}}
diff --git a/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/package-version-editor.md b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/package-version-editor.md
new file mode 100644
index 000000000..d64df7499
--- /dev/null
+++ b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/Admin/packages/package-version-editor.md
@@ -0,0 +1,213 @@
+---
+title: "Package Version Editor"
+linkTitle: "Package Version Editor"
+description: "Summary and anatomy of the Package Version Editor"
+weight: 30
+---
+
+# {{% param title %}}
+
+## Summary
+
+The Package Version Editor displays details of the selected package version and allows management of it.
+
+## Anatomy
+
+{{< figure src="/images/Package Version Editor.png" title="Package Version Editor" >}}
+
+Selecting a package version in the [Package Definitions Grid][] will display it's details in the Package Version Editor; the [Definition][] tab will be selected, displaying the flows it contains and buttons to:
+
+* [Create New Version][] of the package based on the selected package version.
+* [Publish][] or [Unpublish][] the package version to the {{% ctx %}} Execution Services.
+* [Set As Default Package][] enabling flows to be executed from all versions of this package without specifying the package name in the execution REST Request.
+* [Set As Default Version][] enabling flows to be executed from the package version without specifying the package version in the execution REST Request.
+* [Export][] the selected package version to a {{% ctx %}} Package file.
+
+{{% alert title="Note" %}}
+Some buttons are not visible until the package version has been initially published.
+{{% /alert %}}
+
+The Package Version Editor contains the following tabs:
+
+* [Definition][] - displays the name, version and flows contained in this package version.
+* [Authorisation][] - allows the selection of LDAP groups authorised to execute flows contained in this package version.
+* [Schedules][] – allows configuration of schedules to automatically execute flows contained in this package version at defined times or intervals.
+* [Triggers][] - allows configuration of SNMP triggers to automatically execute flows contained in this package version on receipt of SNMP traps.
+* [Running Executions][] - displays a list of running executions of flows in this package version and enables the user to abort them.
+
+### Definition
+
+Displays the flows contained in this package version and the actions that can be performed on it.
+
+#### Create a New Package Version
+
+A new package version can be created from any existing package version. Creating a new version allows additional flows to be added and existing flows to be removed; in addition existing flows may be individually updated to their current Master Version contained in the Master Repository or kept at their original version.
+
+The created package version may optionally define [schedules][Schedules] to execute flows at specific times, [triggers][Triggers] to execute flows on receipt of SNMP traps, and the selection of LDAP Groups [authorised][Authorisation] to execute flows contained in this package version.
+
+The new package version does not retain any of the configured schedules or triggers set on the source version. This is a known limitation and should be addressed in a future release.
+
+See the [Create a New Package Version][Create a New Package Version tutorial] tutorial for a step-by-step guide.
+
+#### Publish a Package Version
+
+When a package version is published it is made available to the {{% ctx %}} Execution Services. The first execution of a flow on a node will cause the flow to be compiled, cached and executed on that node.
+
+Published {{% ctx %}} Package Versions may be explicitly set as the Default Version for that {{% ctx %}} Package, meaning that a REST Request to execute a flow from that published {{% ctx %}} Package Version does not have to specify the Package Version.
+
+See the [Publish a Package Version][Publish a Package Version tutorial] tutorial for a step-by-step guide.
+
+#### Set As Default Package
+
+The default package specifies which package will be used to execute flows if the execution REST Request omits the Package Name to specify the package to use. There is only one default package for each {{% ctx %}} platform.
+
+Any package that has a [published][Publish] package version can be set as the default package. If all the package versions associated with the default package are [unpublished][Unpublish], the default package remains unchanged.
+
+See the [Set the Default Package][Set the Default Package tutorial] tutorial for a step-by-step guide.
+
+#### Set As Default Version
+
+The default version specifies which package version will be used to execute flows if the execution REST Request omits the Package Version to specify the package version to use. Every package will have a default version set, either implicitly or explicitly.
+
+By default, the most recently [published][Publish] package version will be implicitly set as the default version. If the implicitly set default version of a package is [unpublished][Unpublish], the next most recently published version of that package will be implicitly set as the default version.
+
+Any published package version may be explicitly set as the default version. An explicitly set default version will remain the default version regardless of other package versions that are published or unpublished.
+
+If a package version that has been set as the default version is unpublished, no other published package version associated with that package will be implicitly set as the default version. In this instance, there will be no default package version available for that package.
+
+If an unpublished package version that was previously set as the default version is published again, it will automatically become the explicitly set default version.
+
+If all the versions of a package are unpublished and then a package version is republished, it will become implicitly set as the default version, even if it was explicitly set as the default version before unpublishing.
+
+See the [Set the Default Package Version][Set the Default Package Version tutorial] tutorial for a step-by-step guide.
+
+#### Unpublish a Package Version
+
+When a package version is unpublished, it is removed from the {{% ctx %}} Execution Services and flow executions cannot be started for any flows in that package; however, any currently [running executions][Running Executions] from that package version will continue to completion. When all instances of an executing flow in an unpublished package have completed, the cache of the compiled flow is discarded.
+
+See the [Unpublish a Package Version][Unpublish a Package Version tutorial] tutorial for a step-by-step guide.
+
+#### Export a Package Version
+
+Any package version can be exported to a file, which can be used for [importing][Import] the package to another {{% ctx %}} Gateway or for archiving purposes. The export file is automatically downloaded from the browser and has the file name of `<Package Name>.ctxpkg`.
+
+The exported file contains the definition of the package version, including the flows contained in the package. Any [schedules][Schedules], [triggers][Triggers] or [authorisation][Authorisation] set on the package version are not included in the exported file. This is a known limitation and should be addressed in a future release.
+
+See the [Export a Package Version][Export a Package Version tutorial] tutorial for a step-by-step guide.
+
+### Authorisation
+
+The Authorisation tab on a package version defines which LDAP groups can execute flows contained in that package version, using Token-based OAuth2 authorisation.
+
+The list of Active Directory objects displayed to define flow execution authorisation is retrieved from the Active Directory server configured in LDAP Connection for {{% ctx %}} Gateway and is filtered by the same base DNs. In a future release we may allow for a different LDAP connection to be used to define flow execution authorisation.
+
+See the [Set Authorisation on a Package Version][Set Authorisation on a Package Version tutorial] tutorial for a step-by-step guide.
+
+### Schedules
+
+A schedule allows flow executions to occur at defined times, passing values to the flow’s [input variables][Input Variables]. Multiple schedules can be configured; a schedule can execute a single flow and a flow can be executed by mutiple schedules.
+
+Each schedule definition consists of a `Name`, which is used to easily identify the schedule, and an optional `Description` to provide additional information. The defintion also specifies the `Flow` to be executed, the `Type` of schedule (currently only CRON is available) and the schedule, expressed as a `CRON Expression`, to initiate the flow execution. The CRON expression entered will also be displayed in a human readable format.
+
+Any data to be passed to the flow’s [input variables][Input Variables] is entered using [expression editors][Expression Editor].
+
+Creating a [new package version][Create New Version] will not inherit the schedule configuration from the source version. Similarly, exporting a package version will not include the schedule configuration in the {{% ctx %}} Package file. These are known limitations and should be addressed in a future release.
+
+See the [Create a Schedule on a Package Version][Create a Schedule on a Package Version tutorial] tutorial for a step-by-step guide.
+
+### Triggers
+
+A trigger allows flow executions to occur on receipt of an SNMP Trap, passing values to the flow’s [input variables][Input Variables], and if required, the SNMP Trap PDU can be stored in a selected input variable as an object. Multiple triggers can be configured; a trigger can execute a single flow, and a flow can be executed by multiple triggers.
+
+Each trigger definition consists of a `Name`, which is used to easily identify the trigger, and an optional `Description` to provide additional information. The definition also specifies the `Flow` to be executed as well as a set of conditions that, on receipt of a matching SNMP Trap, will execute the flow.
+
+The conditions that must be set are:
+
+* The `Device Address` of the device sending the SNMP Trap.
+
+    This can be a single IPv4 address, a list of comma-separated IPv4 addresses, a range of IPv4 addresses, CIDR subnets, or the * symbol to represent any address.
+* The `Device Port` of the device sending the SNMP Trap.
+
+    This can be a single port, a list of comma-separated ports, a range of ports, or the * symbol to represent any port.
+* The `Trap OID`.
+
+    This can be a single OID, a list of comma-separated OIDs, a range of OIDs, or the * symbol to represent any OID.
+
+* The `SNMP Version`; either: *SNMPv1*, *SNMPv2c*, or *SNMPv3*.
+  * If *SNMPv1* is selected, a `Community` and `Agent Address` must be configured.
+    * `Community` can be any value, a list of comma-separated values, or the * symbol to represent any community.
+    * `Agent Address` matches with the device address contained in the SNMP PDU, and can be a single IPv4 address, a list of comma-separated IPv4 addresses, a range of IPv4 addresses, CIDR subnets, or the * symbol to represent any address.
+  * If *SNMPv2c* is selected, a `Community` must be configured.
+    * `Community` can be any value, a list of comma-separated values, or the * symbol to represent any community.
+  * If *SNMPv3* is selected, it is necessary to setup one or more authentication users from the `Configure SNMPv3 Users` hyperlink, above the list of existing SNMP Triggers.
+
+Any data to be passed to the flow’s [input variables][Input Variables] is entered using [expression editors][Expression Editor], except for the SNMP Trap PDU which, if required, is dynamically passed to a selected input variable, overwriting any static or default values configured for that variable.
+
+Creating a [new package version][Create New Version] will not inherit the trigger configuration from the source version. Similarly, exporting a package version will not include the trigger configuration in the {{% ctx %}} Package file. These are known limitations and should be addressed in a future release.
+
+See the [Create a Trigger on a Package Version][Create a Trigger on a Package Version tutorial] tutorial for a step-by-step guide.
+
+### Running Executions
+
+The Running Executions tab displays a list of currently running flow executions for the selected package version. Each row in the list is a distinct flow execution, and identifies the `Flow Name`, its `Execution Id`, the time the execution `Started At`, and the `Duration` of that execution; the `Duration` is updated at 10 second intervals.
+
+Any running flow execution may be aborted by selecting the flow and clicking the `Stop the execution` icon. The flow execution will be stopped immediately.
+
+See the [View and Abort Running Flow Executions][View and Abort Running Flow Executions tutorial] tutorial for a step-by-step guide.
+
+## Remarks
+
+### Known Limitations
+
+* Only flow versions inherited from the source package version, or the Master Versions stored in the Master Repository, can be included in a new package version.
+* New package versions do not retain any of the configured schedules or triggers set on the source version.
+* Exported package versions do not retain any of the configured schedules, triggers or authorisation set on the package version being exported.
+* To set the default package, it is necessary to select a published package version; it is not possible to set the default package by selecting a version that is not published even if other versions of the same package are published.
+* Currently, a schedule cannot be edited; new schedules can be created, and existing schedules deleted.
+
+## See Also
+
+### Related Concepts
+
+* [What is a Package?][]
+
+### Related Tutorials
+
+* [Create a New Package Version][Create a New Package Version tutorial]
+* [Publish a Package Version][Publish a Package Version tutorial]
+* [Set the Default Package][Set the Default Package tutorial]
+* [Set the Default Package Version][Set the Default Package Version tutorial]
+* [Unpublish a Package Version][Unpublish a Package Version tutorial]
+* [Export a Package Version][Export a Package Version tutorial]
+* [Set Authorisation on a Package Version][Set Authorisation on a Package Version tutorial]
+* [Create a Schedule on a Package Version][Create a Schedule on a Package Version tutorial]
+* [Create a Trigger on a Package Version][Create a Trigger on a Package Version tutorial]
+* [View and Abort Running Flow Executions][View and Abort Running Flow Executions tutorial]
+
+[Authorisation]: {{< ref "#authorisation" >}}
+[Create New Version]: {{< ref "#create-a-new-package-version" >}}
+[Definition]: {{< ref "#definition" >}}
+[Export]: {{< ref "#export-a-package-version" >}}
+[Publish]: {{< ref "#publish-a-package-version" >}}
+[Running Executions]: {{< ref "#running-executions" >}}
+[Schedules]: {{< ref "#schedules" >}}
+[Set As Default Package]: {{< ref "#set-as-default-package" >}}
+[Set As Default Version]: {{< ref "#set-as-default-version" >}}
+[Triggers]: {{< ref "#triggers" >}}
+[Unpublish]: {{< ref "#unpublish-a-package-version" >}}
+
+[Create a New Package Version tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.CreateNewPackageVersion" >}}
+[Create a Schedule on a Package Version tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.Schedules" >}}
+[Create a Trigger on a Package Version tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.Triggers" >}}
+[Export a Package Version tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.ExportPackage" >}}
+[Expression Editor]: {{< url path="Cortex.Reference.Concepts.Fundamentals.Blocks.BlockProperties.PropertyEditors.ExpressionEditor.MainDoc" >}}
+[Import]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageDefinitionsGrid.Import" >}}
+[Input Variables]: {{< url path="Cortex.Reference.Concepts.Fundamentals.Variables.WhatIsAVariable.FlowInputVariable" >}}
+[Publish a Package Version tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.PublishPackage" >}}
+[Set Authorisation on a Package Version tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.Authorisation" >}}
+[Set the Default Package tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.SetDefaultPackage" >}}
+[Set the Default Package Version tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.SetDefaultPackageVersion" >}}
+[Unpublish a Package Version tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.UnpublishPackage" >}}
+[View and Abort Running Flow Executions tutorial]: {{< url path="Cortex.Tutorials.Administration.PackageManagement.RunningExecutions" >}}
+[Package Definitions Grid]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageDefinitionsGrid.MainDoc" >}}
+[What is a Package?]: {{< url path="Cortex.Reference.Concepts.Fundamentals.Packages.WhatIsAPackage.MainDoc" >}}
diff --git a/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/_index.md b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/_index.md
new file mode 100644
index 000000000..750958dde
--- /dev/null
+++ b/content/en/docs/2025.1/Guides/user-guides/user-interfaces/gateway/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Gateway"
+linkTitle: "Gateway"
+description: "This section includes user guides related to {{% ctx %}} Gateway."
+weight: 10
+---
diff --git a/content/en/docs/2025.1/Reference/Concepts/fundamentals/packages/_index.md b/content/en/docs/2025.1/Reference/Concepts/fundamentals/packages/_index.md
new file mode 100644
index 000000000..50fc8fe53
--- /dev/null
+++ b/content/en/docs/2025.1/Reference/Concepts/fundamentals/packages/_index.md
@@ -0,0 +1,6 @@
+---
+title: "Packages"
+linkTitle: "Packages"
+description: "Information regarding what a package is."
+weight: 800
+---
diff --git a/content/en/docs/2025.1/Reference/Concepts/fundamentals/packages/what-is-a-package.md b/content/en/docs/2025.1/Reference/Concepts/fundamentals/packages/what-is-a-package.md
new file mode 100644
index 000000000..5b0ca2891
--- /dev/null
+++ b/content/en/docs/2025.1/Reference/Concepts/fundamentals/packages/what-is-a-package.md
@@ -0,0 +1,71 @@
+---
+title: "What is a Package?"
+linkTitle: "What is a Package?"
+description: "Information regarding the anatomy of a package, creating a package, publishing a package, and starting a flow execution."
+weight: 1
+---
+
+
+# {{% param title %}}
+
+## Summary
+
+A {{% ctx %}} Package contains a set of independent or related flows that together form an automation solution.
+
+Users with the Admin role can use the [{{% ctx %}} Package Management][] feature to manage packages, including [creating][CreatePackage] and [publishing][Publish] them.
+
+## Anatomy of a Package
+
+{{< figure src="/images/Package Management.png" >}}
+
+## Actions
+
+### Creating a Package
+
+Packages are immutable; once a package has been [created][CreatePackage], it is not possible to add flows, delete flows or update the version of flows contained within it. However, a [new version][] of the same package may be created from any previous version, which can contain different or updated flows.
+
+### Publishing a Package
+
+Packages must be [published][Publish] to the {{% ctx %}} Execution Services, making the flows within them available for execution; it is not possible to publish flows unless they are contained in a package.
+
+It is possible to [publish][Publish] multiple versions of the same package to the {{% ctx %}} Execution Services, with each package version acting independently of the others; this permits CI/CD operations within the same {{% ctx %}} platform.
+
+### Starting a Flow Execution
+
+Executions of flows contained within published packages can be triggered via a REST Request. This can be [access controlled][authorisation] for each flow in the package using OAuth2 authorisation, which can be independently set on each package version, and can be restricted based on groups in the configured LDAP server.
+
+A published package may be set as the [Default Package][], which will be used if the Package Name is not explicitly identified in a REST Request to execute a flow. Additionally, within each package, a published Package Version may be set as the [Default Package Version][]; this will be used if the Package Version is not explicitly identified in a REST Request to execute a flow.
+
+### Other Actions
+
+{{% ctx %}} Package Management also allows for:
+
+* [Exporting][] a package version to a {{% ctx %}} Package file for archiving or [importing][Importing] to a different {{% ctx %}} Gateway
+* [Importing][] a package version from a {{% ctx %}} Package file
+* [Defining schedules][] on different package versions to execute flows at pre-determined times; flows within a package version may be assigned any number of schedules.
+* [Defining triggers][] on different package versions to execute flows on receipt of an SNMP Trap; flows within a package version may be assigned any number of triggers.
+* Viewing the total number of [running flow executions][] per package, viewing the individual [running flow executions][] associated with a package version, and aborting [running flow executions][].
+
+## See Also
+
+### Related Guides
+
+* [Package Management Overview][]
+* [Package Definitions Grid][]
+* [Package Version Editor][]
+
+[{{% ctx %}} Package Management]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.MainDoc" >}}
+[authorisation]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Authorisation" >}}
+[CreatePackage]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageDefinitionsGrid.CreatePackage" >}}
+[Default Package]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.SetDefaultPackage" >}}
+[Default Package Version]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.SetDefaultVersion" >}}
+[Defining schedules]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Schedules" >}}
+[Defining triggers]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Triggers" >}}
+[Exporting]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Export" >}}
+[Importing]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageDefinitionsGrid.Import" >}}
+[new version]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.CreateNewVersion" >}}
+[Package Management Overview]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.Overview.MainDoc" >}}
+[Package Definitions Grid]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageDefinitionsGrid.MainDoc" >}}
+[Package Version Editor]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.MainDoc" >}}
+[Publish]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.Publish" >}}
+[running flow executions]: {{< url path="Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor.RunningExecutions" >}}
diff --git a/content/en/docs/2025.1/Tutorials/Administration/_index.md b/content/en/docs/2025.1/Tutorials/Administration/_index.md
index a07d3f026..683d27a18 100644
--- a/content/en/docs/2025.1/Tutorials/Administration/_index.md
+++ b/content/en/docs/2025.1/Tutorials/Administration/_index.md
@@ -5,44 +5,3 @@ description: "This section includes tutorials about administering the {{% ctx %}
 weight: 40
 ---
 
-## Managing role-based access control
-
-Shows how to manage role-based access control within Gateway, including assigning access and flow permissions.
-
-{{< youtube id="v-nll5V4p1Q" >}}
-
-## Exporting flows
-
-Shows how to export a set of flows as a `.studiopkg` file.
-
-{{< youtube id="ZpnDmiuTc8o" >}}
-
-## Importing flows
-
-Shows how to import a set of flows from a `.studiopkg` file.
-
-{{< youtube id="_A4CuCKZuys" >}}
-
-## Creating packages
-
-Shows how to create a release package containing all the flows required for your self-contained automation solution.
-
-{{< youtube id="dzcjU0Ca7EY" >}}
-
-## Publishing packages
-
-Shows how to publish a release package into your runtime environment.
-
-{{< youtube id="iWXMhgPMeHg" >}}
-
-## Managing package versions
-
-Shows how to create new versions of a release package, including adding flows, updating flow versions, and removing flows.
-
-{{< youtube id="lrJMOKyRnGY" >}}
-
-## Setting default packages
-
-Shows how to set the default package and the default version of each package.
-
-{{< youtube id="th-OPwfQ7Vo" >}}
diff --git a/content/en/docs/2025.1/Tutorials/Administration/package-management.md b/content/en/docs/2025.1/Tutorials/Administration/package-management.md
new file mode 100644
index 000000000..a4842dcc8
--- /dev/null
+++ b/content/en/docs/2025.1/Tutorials/Administration/package-management.md
@@ -0,0 +1,56 @@
+---
+title: "Package Management"
+linkTitle: "Package Management"
+description: "This section includes tutorials about managing packages on the {{% ctx %}} platform."
+weight: 1
+---
+
+# {{% param title %}}
+
+## Create a Package
+
+{{< scribe title="How_to_Create_a_New_CORTEX_Package_Definition" id="T_4G1ik0QPmBX9Za6m4WsA" >}}
+
+## Import a Package
+
+{{< scribe title="How_to_Import_a_CORTEX_Package_File" id="2uhQbG_rTomCCVJTcCjN8A" >}}
+
+## Create a New Package Version
+
+{{< scribe title="How_to_Create_a_New_Version_of_a_CORTEX_Package" id="D9ugVBuYQiiialecvXbVVQ" >}}
+
+## Publish a Package Version
+
+{{< scribe title="How_to_Publish_a_CORTEX_Package" id="1Qd2iu1RRpKyoCCzzf6wpQ" >}}
+
+## Set the Default Package
+
+{{< scribe title="How_to_Set_the_Default_Package" id="XS8ged-jSKC7gR4UXAKPgQ" >}}
+
+## Set the Default Package Version
+
+{{< scribe title="How_to_Set_the_Default_Package_Version_for_a_CORTEX_Package" id="cfuXBngKRkmSPdA81juTbA" >}}
+
+## Unpublish a Package Version
+
+{{< scribe title="How_to_Unpublish_a_CORTEX_Package" id="gl8v5p__R3OlB8oLB9m28w" >}}
+
+## Export a Package Version
+
+{{< scribe title="How_to_Export_a_CORTEX_Package_Version" id="roziXdU1TqST2d9a2IDOxA" >}}
+
+## Set Authorisation on a Package Version
+
+{{< scribe title="How_to_Set_Flow_Execution_Authorisation_on_a_CORTEX_Package" id="s9ZN9efvTrCgJQQH2aTGsw" >}}
+
+## Create a Schedule on a Package Version
+
+{{< scribe title="How_to_Create_a_Schedule_on_a_CORTEX_Package" id="PmxB9BveTb6DIqhaI4AWTA" >}}
+
+## Create a Trigger on a Package Version
+
+{{< scribe title="How_to_Create_a_Trigger_on_a_CORTEX_Package" id="z6CwThFVTHSRdL1mAMFPsQ" >}}
+
+## View and Abort Running Flow Executions
+
+{{< scribe title="How_to_View_and_Abort_Running_Flow_Executions_Using_CORTEX_Package_Management" id="Dgi3cpo4TZ-G426w6GEkUQ" >}}
diff --git a/content/en/docs/2025.1/_shared/upgrade/2024.11/upgrade-web-application-server/configure-gateway-script.md b/content/en/docs/2025.1/_shared/upgrade/2024.11/upgrade-web-application-server/configure-gateway-script.md
index f40d75791..cbcf2fb47 100644
--- a/content/en/docs/2025.1/_shared/upgrade/2024.11/upgrade-web-application-server/configure-gateway-script.md
+++ b/content/en/docs/2025.1/_shared/upgrade/2024.11/upgrade-web-application-server/configure-gateway-script.md
@@ -45,4 +45,4 @@ To check the previous configuration values open the `Cortex.Upgrade.GatewayConfi
 
 1. Save and close `Cortex.Innovation.Install.Gateway.ps1`.
 
-[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeCortex.Advanced.SSLBestPractices" >}}
+[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.Advanced.SSLBestPractices" >}}
diff --git a/content/en/docs/2025.1/_shared/upgrade/2024.3/upgrade-web-application-server/configure-gateway-script.md b/content/en/docs/2025.1/_shared/upgrade/2024.3/upgrade-web-application-server/configure-gateway-script.md
index e9e8dd039..d972e86dc 100644
--- a/content/en/docs/2025.1/_shared/upgrade/2024.3/upgrade-web-application-server/configure-gateway-script.md
+++ b/content/en/docs/2025.1/_shared/upgrade/2024.3/upgrade-web-application-server/configure-gateway-script.md
@@ -32,4 +32,4 @@
 
 1. Save and close `Cortex.Innovation.Install.Gateway.ps1`.
 
-[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeCortex.Advanced.SSLBestPractices" >}}
+[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.Advanced.SSLBestPractices" >}}
diff --git a/content/en/docs/2025.1/_shared/upgrade/2024.5/upgrade-web-application-server/configure-gateway-script.md b/content/en/docs/2025.1/_shared/upgrade/2024.5/upgrade-web-application-server/configure-gateway-script.md
index 84057e4a7..6a7ab4e7d 100644
--- a/content/en/docs/2025.1/_shared/upgrade/2024.5/upgrade-web-application-server/configure-gateway-script.md
+++ b/content/en/docs/2025.1/_shared/upgrade/2024.5/upgrade-web-application-server/configure-gateway-script.md
@@ -32,4 +32,4 @@
 
 1. Save and close `Cortex.Innovation.Install.Gateway.ps1`.
 
-[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeCortex.Advanced.SSLBestPractices" >}}
+[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.Advanced.SSLBestPractices" >}}
diff --git a/content/en/docs/2025.1/_shared/upgrade/2024.7/upgrade-web-application-server/configure-gateway-script.md b/content/en/docs/2025.1/_shared/upgrade/2024.7/upgrade-web-application-server/configure-gateway-script.md
index 05cfdc5c2..7401ec584 100644
--- a/content/en/docs/2025.1/_shared/upgrade/2024.7/upgrade-web-application-server/configure-gateway-script.md
+++ b/content/en/docs/2025.1/_shared/upgrade/2024.7/upgrade-web-application-server/configure-gateway-script.md
@@ -45,4 +45,4 @@ To check the previous configuration values open the `Cortex.Upgrade.GatewayConfi
 
 1. Save and close `Cortex.Innovation.Install.Gateway.ps1`.
 
-[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeCortex.Advanced.SSLBestPractices" >}}
+[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.Advanced.SSLBestPractices" >}}
diff --git a/content/en/docs/2025.1/_shared/upgrade/2024.9/upgrade-web-application-server/configure-gateway-script.md b/content/en/docs/2025.1/_shared/upgrade/2024.9/upgrade-web-application-server/configure-gateway-script.md
index 948c17a79..6cc6e8960 100644
--- a/content/en/docs/2025.1/_shared/upgrade/2024.9/upgrade-web-application-server/configure-gateway-script.md
+++ b/content/en/docs/2025.1/_shared/upgrade/2024.9/upgrade-web-application-server/configure-gateway-script.md
@@ -45,4 +45,4 @@ To check the previous configuration values open the `Cortex.Upgrade.GatewayConfi
 
 1. Save and close `Cortex.Innovation.Install.Gateway.ps1`.
 
-[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeCortex.Advanced.SSLBestPractices" >}}
+[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.Advanced.SSLBestPractices" >}}
diff --git a/content/en/docs/2025.1/_shared/upgrade/2025.1/upgrade-web-application-server/configure-gateway-script.md b/content/en/docs/2025.1/_shared/upgrade/2025.1/upgrade-web-application-server/configure-gateway-script.md
index 53bcc7cc1..24d431ba5 100644
--- a/content/en/docs/2025.1/_shared/upgrade/2025.1/upgrade-web-application-server/configure-gateway-script.md
+++ b/content/en/docs/2025.1/_shared/upgrade/2025.1/upgrade-web-application-server/configure-gateway-script.md
@@ -45,4 +45,4 @@ To check the previous configuration values open the `Cortex.Upgrade.GatewayConfi
 
 1. Save and close `Cortex.Innovation.Install.Gateway.ps1`.
 
-[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeCortex.Advanced.SSLBestPractices" >}}
+[Security Best Practices]: {{< url path="Cortex.Guides.UpgradeGuides.UpgradeCortex.Advanced.SSLBestPractices" >}}
diff --git a/content/static/2025.1/images/Package Definitions Grid.png b/content/static/2025.1/images/Package Definitions Grid.png
new file mode 100644
index 000000000..c5155b15c
Binary files /dev/null and b/content/static/2025.1/images/Package Definitions Grid.png differ
diff --git a/content/static/2025.1/images/Package Management.png b/content/static/2025.1/images/Package Management.png
new file mode 100644
index 000000000..50240eadc
Binary files /dev/null and b/content/static/2025.1/images/Package Management.png differ
diff --git a/content/static/2025.1/images/Package Version Editor.png b/content/static/2025.1/images/Package Version Editor.png
new file mode 100644
index 000000000..940730af5
Binary files /dev/null and b/content/static/2025.1/images/Package Version Editor.png differ
diff --git a/data/urls.toml b/data/urls.toml
index 01e699d3b..b39f46562 100644
--- a/data/urls.toml
+++ b/data/urls.toml
@@ -476,7 +476,6 @@
                         [Cortex.GettingStarted.Cloud.AddObservabilityToInnovation.Grafana.TryItOut]
                             MainDoc = "/docs/getting-started/cloud/add-observability-to-innovation/grafana/try-it-out/"
 
-
     [Cortex.Guides]
         MainDoc = "/docs/guides/"
         [Cortex.Guides.Studio]
@@ -684,26 +683,6 @@
                     TryItOut = "/docs/guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/try-it-out"
                     UpgradeApplicationServer = "/docs/guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-application-server"
                     UpgradeWebApplicationServer = "/docs/guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-web-application-server"
-            [Cortex.Guides.UpgradeCortex.2024.11to2025.1]
-                MainDoc = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/"
-                [Cortex.Guides.UpgradeCortex.2024.11to2025.1.Advanced]
-                    UpgradeFlows = "/docs/guides/upgrade-cortex/advanced/upgrade-flows"
-                [Cortex.Guides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA]
-                    MainDoc = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/"
-                    PreUpgrade = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/pre-upgrade"
-                    TryItOut = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/try-it-out"
-                    Upgrade = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade"
-                    UpgradeApplicationAndLoadBalancerServers = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-application-and-loadbalancer-servers"
-                    UpgradeDebugger = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-debugger"
-                    UpgradeGateway = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-gateway"
-                    UpgradeWebApplicationServer = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server"
-                [Cortex.Guides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA]
-                    MainDoc = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/"
-                    PreUpgrade = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/pre-upgrade"
-                    TryItOut = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/try-it-out"
-                    Upgrade = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade"
-                    UpgradeApplicationServer = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-application-server"
-                    UpgradeWebApplicationServer = "/docs/guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-web-application-server"
         [Cortex.Guides.UpgradeObservability]
             MainDoc = "/docs/guides/upgrade-observability/"
             [Cortex.Guides.UpgradeObservability.OnPremise]
@@ -729,6 +708,169 @@
                     Download = "/docs/guides/upgrade-observability/dashboards/grafana/upgrade-dashboards/#download-the-default-dashboards"
                     UpgradeDashboards = "/docs/guides/upgrade-observability/dashboards/grafana/upgrade-dashboards"
                     TryItOut = "/docs/guides/upgrade-observability/dashboards/grafana/try-it-out"
+        [Cortex.Guides.UpgradeGuides]
+            MainDoc = "/docs/guides/upgrade-guides/"
+            [Cortex.Guides.UpgradeGuides.UpgradeCortex]
+                MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/"      
+                [Cortex.Guides.UpgradeGuides.UpgradeCortex.Advanced]
+                    SSLBestPractices = "/docs/guides/upgrade-guides/upgrade-cortex/advanced/ssl-best-practices"
+                [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3]
+                    MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.Advanced]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/advanced"
+                        SSLBestPractices = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/advanced/ssl-best-practices"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.MultipleServerWithHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/try-it-out"
+                        UpgradeApplicationAndLoadBalancerServers = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers"
+                        UpgradeDebugger = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger"
+                        UpgradeGateway = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/multiple-server-with-ha/upgrade-web-application-server"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.1to2024.3.SingleServerWithoutHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/try-it-out"
+                        UpgradeApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-application-server"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.1-to-2024.3/single-server-without-ha/upgrade-web-application-server"
+                [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5]
+                    MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.MultipleServerWithHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/try-it-out"
+                        UpgradeApplicationAndLoadBalancerServers = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers"
+                        UpgradeDebugger = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger"
+                        UpgradeGateway = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/multiple-server-with-ha/upgrade-web-application-server"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.3to2024.5.SingleServerWithoutHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/try-it-out"
+                        UpgradeApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-application-server"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.3-to-2024.5/single-server-without-ha/upgrade-web-application-server"
+                [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7]
+                    MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.Advanced]
+                        UpgradeFlows = "/docs/guides/upgrade-guides/upgrade-cortex/advanced/upgrade-flows"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.MultipleServerWithHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/try-it-out"
+                        UpgradeApplicationAndLoadBalancerServers = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers"
+                        UpgradeDebugger = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger"
+                        UpgradeGateway = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/multiple-server-with-ha/upgrade-web-application-server"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.5to2024.7.SingleServerWithoutHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/try-it-out"
+                        UpgradeApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-application-server"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.5-to-2024.7/single-server-without-ha/upgrade-web-application-server"
+                [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9]
+                    MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.Advanced]
+                        UpgradeFlows = "/docs/guides/upgrade-guides/upgrade-cortex/advanced/upgrade-flows"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.MultipleServerWithHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/try-it-out"
+                        UpgradeApplicationAndLoadBalancerServers = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers"
+                        UpgradeDebugger = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger"
+                        UpgradeGateway = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server"
+                        WebApplicationServerPreqrequisites = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/multiple-server-with-ha/upgrade-web-application-server/prerequisites"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.7to2024.9.SingleServerWithoutHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/try-it-out"
+                        UpgradeApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-application-server"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.7-to-2024.9/single-server-without-ha/upgrade-web-application-server"
+                [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11]
+                    MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.Advanced]
+                        UpgradeFlows = "/docs/guides/upgrade-guides/upgrade-cortex/advanced/upgrade-flows"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.MultipleServerWithHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/"
+                        Prerequisites = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/prerequisites"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/try-it-out"
+                        RetrieveAppServerEncryptionKey = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/prerequisites/#retrieve-existing-encryption-key"
+                        UpgradeApplicationAndLoadBalancerServers = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-application-and-loadbalancer-servers"
+                        UpgradeDebugger = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-debugger"
+                        UpgradeGateway = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/upgrade-gateway"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server"
+                        WebApplicationServerPreqrequisites = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/multiple-server-with-ha/upgrade-web-application-server/prerequisites"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.9to2024.11.SingleServerWithoutHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/try-it-out"
+                        UpgradeApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-application-server"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.9-to-2024.11/single-server-without-ha/upgrade-web-application-server"
+                [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1]
+                    MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.Advanced]
+                        UpgradeFlows = "/docs/guides/upgrade-guides/upgrade-cortex/advanced/upgrade-flows"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.MultipleServerWithHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/"
+                        PreUpgrade = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/pre-upgrade"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/try-it-out"
+                        Upgrade = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade"
+                        UpgradeApplicationAndLoadBalancerServers = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-application-and-loadbalancer-servers"
+                        UpgradeDebugger = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-debugger"
+                        UpgradeGateway = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server/upgrade-gateway"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/multiple-server-with-ha/upgrade/upgrade-web-application-server"
+                    [Cortex.Guides.UpgradeGuides.UpgradeCortex.2024.11to2025.1.SingleServerWithoutHA]
+                        MainDoc = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/"
+                        PreUpgrade = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/pre-upgrade"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/try-it-out"
+                        Upgrade = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade"
+                        UpgradeApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-application-server"
+                        UpgradeWebApplicationServer = "/docs/guides/upgrade-guides/upgrade-cortex/2024.11-to-2025.1/single-server-without-ha/upgrade/upgrade-web-application-server"
+            [Cortex.Guides.UpgradeGuides.UpgradeObservability]
+                MainDoc = "/docs/guides/upgrade-guides/upgrade-observability/"
+                [Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise]
+                    [Cortex.Guides.UpgradeGuides.UpgradeObservability.OnPremise.Grafana]
+                        BackupOldFiles = "/docs/guides/upgrade-guides/upgrade-observability/on-premise/grafana/prerequisites/#backup-old-files"
+                        MakeArtefactsAvailable = "/docs/guides/upgrade-guides/upgrade-observability/on-premise/grafana/prerequisites/#make-artefacts-available"
+                        Prerequisites = "/docs/guides/upgrade-guides/upgrade-observability/on-premise/grafana/prerequisites"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-observability/on-premise/grafana/try-it-out"
+                        UpgradeGrafana = "/docs/guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-grafana"
+                        UpgradeLoki = "/docs/guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-loki"
+                        UpgradePromtail = "/docs/guides/upgrade-guides/upgrade-observability/on-premise/grafana/upgrade-promtail"
+                        VerifyOldVersion = "/docs/guides/upgrade-guides/upgrade-observability/on-premise/grafana/prerequisites/#verify-old-version"
+                [Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud]
+                    [Cortex.Guides.UpgradeGuides.UpgradeObservability.Cloud.Grafana]
+                        BackupOldFiles = "/docs/guides/upgrade-guides/upgrade-observability/cloud/grafana/prerequisites/#backup-old-files"
+                        MakeArtefactsAvailable = "/docs/guides/upgrade-guides/upgrade-observability/cloud/grafana/prerequisites/#make-artefacts-available"
+                        Prerequisites = "/docs/guides/upgrade-guides/upgrade-observability/cloud/grafana/prerequisites"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-observability/cloud/grafana/try-it-out"
+                        UpgradePromtail = "/docs/guides/upgrade-guides/upgrade-observability/cloud/grafana/upgrade-promtail"
+                        VerifyOldVersion = "/docs/guides/upgrade-guides/upgrade-observability/cloud/grafana/prerequisites/#verify-old-version"
+                [Cortex.Guides.UpgradeGuides.UpgradeObservability.Dashboards]
+                    [Cortex.Guides.UpgradeGuides.UpgradeObservability.Dashboards.Grafana]
+                        Download = "/docs/guides/upgrade-guides/upgrade-observability/dashboards/grafana/upgrade-dashboards/#download-the-default-dashboards"
+                        UpgradeDashboards = "/docs/guides/upgrade-guides/upgrade-observability/dashboards/grafana/upgrade-dashboards"
+                        TryItOut = "/docs/guides/upgrade-guides/upgrade-observability/dashboards/grafana/try-it-out"
+        [Cortex.Guides.UserGuides]
+            MainDoc = "/docs/guides/user-guides/"
+            [Cortex.Guides.UserGuides.UserInterfaces]
+                MainDoc = "/docs/guides/user-guides/user-interfaces/"
+                [Cortex.Guides.UserGuides.UserInterfaces.Gateway]
+                    MainDoc = "/docs/guides/user-guides/user-interfaces/gateway/"
+                    [Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin]
+                        MainDoc = "/docs/guides/user-guides/user-interfaces/gateway/admin/"
+                        [Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages]
+                            MainDoc = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/"
+                            [Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.Overview]
+                                MainDoc = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/overview/"
+                            [Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageDefinitionsGrid]
+                                MainDoc = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-definitions-grid/"
+                                CreatePackage = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-definitions-grid/#create-a-package"
+                                Import = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-definitions-grid/#import-a-package"
+                            [Cortex.Guides.UserGuides.UserInterfaces.Gateway.Admin.Packages.PackageVersionEditor]
+                                MainDoc = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/"
+                                Authorisation = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#authorisation"
+                                CreateNewVersion = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#create-a-new-package-version"
+                                Definition = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#definition"
+                                Export = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#export-a-package-version"
+                                Publish = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#publish-a-package-version"
+                                RunningExecutions = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#running-executions"
+                                Schedules = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#schedules"
+                                SetDefaultPackage = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#set-as-default-package"
+                                SetDefaultVersion = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#set-as-default-version"
+                                Triggers = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#triggers"
+                                Unpublish = "/docs/guides/user-guides/user-interfaces/gateway/admin/packages/package-version-editor/#unpublish-a-package-version"
 
 [Cortex.Reference]
         MainDoc = "/docs/reference/"
@@ -1546,6 +1688,10 @@
                     MainDoc = "/docs/reference/concepts/fundamentals/messages/"
                     [Cortex.Reference.Concepts.Fundamentals.Messages.WhatIsAMessage]
                         MainDoc = "/docs/reference/concepts/fundamentals/messages/what-is-a-message/"
+                [Cortex.Reference.Concepts.Fundamentals.Packages]
+                    MainDoc = "/docs/reference/concepts/fundamentals/packages"
+                    [Cortex.Reference.Concepts.Fundamentals.Packages.WhatIsAPackage]
+                        MainDoc = "/docs/reference/concepts/fundamentals/packages/what-is-a-package/"
                 [Cortex.Reference.Concepts.Fundamentals.Variables]
                     MainDoc = "/docs/reference/concepts/fundamentals/variables/"
                     [Cortex.Reference.Concepts.Fundamentals.Variables.UsingVariables]
@@ -2545,6 +2691,23 @@
                 32Bit = "/docs/reference/glossary/0-9/#32-bit"
     [Cortex.Tutorials]
         MainDoc = "/docs/tutorials/"
+        [Cortex.Tutorials.Administration]
+            MainDoc = "/docs/tutorials/administration"
+            [Cortex.Tutorials.Administration.PackageManagement]
+                MainDoc = "/docs/tutorials/administration/package-management"
+                    Authorisation = "/docs/tutorials/administration/package-management/#set-authorisation-on-a-package-version"
+                    CreateNewPackageVersion = "/docs/tutorials/administration/package-management/#create-a-new-package-version"
+                    CreatePackage = "/docs/tutorials/administration/package-management/#create-a-package"
+                    ExportPackage = "/docs/tutorials/administration/package-management/#export-a-package-version"
+                    ImportPackage = "/docs/tutorials/administration/package-management/#import-a-package"
+                    PublishPackage = "/docs/tutorials/administration/package-management/#publish-a-package-version"
+                    RunningExecutions = "/docs/tutorials/administration/package-management/#view-and-abort-running-flow-executions"
+                    Schedules = "/docs/tutorials/administration/package-management/#create-a-schedule-on-a-package-version"
+                    SetDefaultPackage = "/docs/tutorials/administration/package-management/#set-the-default-package"
+                    SetDefaultPackageVersion = "/docs/tutorials/administration/package-management/#set-the-default-package-version"
+                    Triggers = "/docs/tutorials/administration/package-management/#create-a-trigger-on-a-package-version"
+                    UnpublishPackage = "/docs/tutorials/administration/package-management/#unpublish-a-package-version"
+
     [Cortex.Website]
         [Cortex.Website.EngageWithUs]
             MainDoc = "https://www.wearecortex.com/contact/"
diff --git a/layouts/shortcodes/scribe.html b/layouts/shortcodes/scribe.html
new file mode 100644
index 000000000..4c710dd48
--- /dev/null
+++ b/layouts/shortcodes/scribe.html
@@ -0,0 +1,29 @@
+{{- $versionPath := "" }}
+{{- /* Get the current version, and whether the website is currently nested (has /docs prepended). */}}
+{{- $isNested := false }}
+{{- $currentVer := index (findRE `^\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
+{{- if (not $currentVer) }}
+	{{- $currentVer = index (findRE `^\/docs\/docs\/([0-9\.]*|latest)\/` .Page.RelPermalink 1) 0 }}
+	{{- $currentVer = replaceRE `^\/docs` "" $currentVer 1 }}
+	{{- if (or $currentVer (index (findRE `^\/docs\/[^\/]*\/` .Page.RelPermalink 1) 0)) }}
+		{{- $isNested = true }}
+	{{- end }}
+{{- end }}
+{{- if $currentVer }}
+    {{ range where .Site.Params.versions "url" $currentVer }}
+        {{ $versionPath = .version }}
+    {{ end }}
+{{- else }}
+    {{- /*  use latest doc as not in a versioned page  */}}
+    {{ range where .Site.Params.versions "latest" true }}
+        {{- $versionPath = .version }}
+    {{ end }}
+{{- end }}
+{{- if $isNested }}
+    {{- $versionPath = printf "%s%s" "docs/" $versionPath }}
+{{- end }}
+{{- $id := .Get "id" | default (.Get 0) -}}
+  {{- $title := .Get "title" | default "Scribe Tutorial" }}
+  <div class="scribe-video">
+    <iframe src="https://scribehow.com/embed/{{ $title }}__{{ $id }}?as=video" style="background: url(/{{ $versionPath }}/images/loading.gif) no-repeat center;" frameborder="0" allowfullscreen></iframe>
+  </div>