diff --git a/docs/docs-beta/docs/dagster-plus/deployment/code-locations/index.md b/docs/docs-beta/docs/dagster-plus/deployment/code-locations/index.md
index 093e6ee4391ab..c2170c17ca5e2 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/code-locations/index.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/code-locations/index.md
@@ -1,6 +1,7 @@
 ---
 title: "Code locations"
 displayed_sidebar: "dagsterPlus"
+sidebar_position: 8
 ---
 
 # Code locations
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/code-requirements.md b/docs/docs-beta/docs/dagster-plus/deployment/code-requirements.md
index 4de13201cdd03..d5eb39f350744 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/code-requirements.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/code-requirements.md
@@ -2,6 +2,7 @@
 title: 'Dagster+ code requirements'
 displayed_sidebar: 'dagsterPlus'
 sidebar_label: "Code requirements"
+sidebar_position: 1
 ---
 
 Your Dagster project must meet a few requirements to run in Dagster+.
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/dagster-plus-settings.md b/docs/docs-beta/docs/dagster-plus/deployment/dagster-plus-settings.md
index a7c4dad36b30e..9d4661c76251b 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/dagster-plus-settings.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/dagster-plus-settings.md
@@ -1,6 +1,7 @@
 ---
 title: "Dagster+ settings"
 unlisted: true
+sidebar_position: 5
 ---
 
 # Dagster+ settings
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/deployment-settings.md b/docs/docs-beta/docs/dagster-plus/deployment/deployment-settings.md
index 1faca1bef5180..9df2ed6f1dd60 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/deployment-settings.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/deployment-settings.md
@@ -3,6 +3,7 @@ title: "Deployment settings"
 displayed_sidebar: "dagsterPlus"
 sidebar_label: "Deployment settings"
 unlisted: true
+sidebar_position: 6
 ---
 
 # Deployment settings
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/deployment-types.md b/docs/docs-beta/docs/dagster-plus/deployment/deployment-types.md
index f8d3d29a1f9a6..2a9d8938e4dcd 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/deployment-types.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/deployment-types.md
@@ -1,4 +1,5 @@
 ---
+title: Deployment types
 unlisted: true
 ---
 
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/agent-config.md b/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/agent-config.md
index 5fabc3547076b..768a96b6af80b 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/agent-config.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/agent-config.md
@@ -1,7 +1,7 @@
 ---
 title: "Set environment variables using agent config"
 displayed_sidebar: "dagsterPlus"
-sidebar_position: 2
+sidebar_position: 30
 sidebar_label: "Set with agent config"
 unlisted: true
 ---
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/built-in.md b/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/built-in.md
index d81a2cbf93468..bc16eb160776c 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/built-in.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/built-in.md
@@ -1,7 +1,7 @@
 ---
 title: "Built-in environment variables"
 displayed_sidebar: "dagsterPlus"
-sidebar_position: 3
+sidebar_position: 10
 sidebar_label: "Built-in variables"
 ---
 
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/dagster-ui.md b/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/dagster-ui.md
index 514a13fda0705..1e024cdb578d6 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/dagster-ui.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/dagster-ui.md
@@ -1,7 +1,7 @@
 ---
 title: "Setting environment variables with the Dagster+ UI"
 displayed_sidebar: "dagsterPlus"
-sidebar_position: 1
+sidebar_position: 20
 sidebar_label: "Set with Dagster+ UI"
 ---
 
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/index.md b/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/index.md
index 8c5b831ecc2d3..96c210bb49bbe 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/index.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/environment-variables/index.md
@@ -2,6 +2,7 @@
 title: "Environment variables"
 displayed_sidebar: "dagsterPlus"
 unlisted: true
+sidebar_position: 7
 ---
 
 # Environment variables
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/amazon-ecs-existing-vpc.md b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/amazon-ecs-existing-vpc.md
index eab7a6cb68660..80e9877a2a5ff 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/amazon-ecs-existing-vpc.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/amazon-ecs-existing-vpc.md
@@ -2,6 +2,6 @@
 title: "Amazon ECS agents (Existing VPC)"
 displayed_sidebar: "dagsterPlus"
 sidebar_position: 11
-sidebar_label: "Amazon ECS (existing)"
+sidebar_label: "Amazon ECS (Existing VPC)"
 unlisted: true
 ---
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/amazon-ecs-new-vpc.md b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/amazon-ecs-new-vpc.md
index c2e4c4ab150e6..d915bf5d486a7 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/amazon-ecs-new-vpc.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/amazon-ecs-new-vpc.md
@@ -2,6 +2,6 @@
 title: "Amazon ECS agents (New VPC)"
 displayed_sidebar: "dagsterPlus"
 sidebar_position: 10
-sidebar_label: "Amazon ECS (new)"
+sidebar_label: "Amazon ECS (New VPC)"
 unlisted: true
 ---
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/index.md b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/index.md
new file mode 100644
index 0000000000000..113922db0d8a7
--- /dev/null
+++ b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/index.md
@@ -0,0 +1,4 @@
+---
+title: "Agents"
+displayed_sidebar: "dagsterPlus"
+---
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/local.md b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/local.md
index 5ae3fc34d5020..c8a396652e382 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/local.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/local.md
@@ -1,7 +1,7 @@
 ---
 title: "Running a Dagster+ agent locally"
 displayed_sidebar: "dagsterPlus"
-sidebar_position: 40
+sidebar_position: 60
 sidebar_label: "Local"
 ---
 
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/multiple.md b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/multiple.md
index f41c22e684a55..022148b44da42 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/multiple.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/multiple.md
@@ -1,7 +1,7 @@
 ---
 title: "Using multiple agents"
 displayed_sidebar: "dagsterPlus"
-sidebar_position: 50
+sidebar_position: 40
 unlisted: true
 ---
 
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/settings.md b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/settings.md
index c086f9b11a154..b0f499b69bc53 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/settings.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/agents/settings.md
@@ -1,7 +1,7 @@
 ---
 title: "Hybrid agent settings"
 displayed_sidebar: "dagsterPlus"
-sidebar_position: 60
+sidebar_position: 70
 sidebar_label: "Settings"
 unlisted: true
 ---
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/index.md b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/index.md
index 631d802667a0c..ab8b43ed2e212 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/index.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Hybrid deployment"
 displayed_sidebar: "dagsterPlus"
-sidebar_position: 2
+sidebar_position: 3
 ---
 
 # Hybrid deployment
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/tokens.md b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/tokens.md
index ea705c4240bd8..1d573356cb86e 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/hybrid/tokens.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/hybrid/tokens.md
@@ -1,7 +1,7 @@
 ---
 title: 'Hybrid agent tokens'
 displayed_sidebar: 'dagsterPlus'
-sidebar_position: 30
+sidebar_position: 20
 unlisted: true
 ---
 
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/migration/index.md b/docs/docs-beta/docs/dagster-plus/deployment/migration/index.md
new file mode 100644
index 0000000000000..2e0cf9abc5954
--- /dev/null
+++ b/docs/docs-beta/docs/dagster-plus/deployment/migration/index.md
@@ -0,0 +1,4 @@
+---
+title: Migration
+sidebar_position: 4
+---
\ No newline at end of file
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/migration/self-hosted-to-dagster-plus.md b/docs/docs-beta/docs/dagster-plus/deployment/migration/self-hosted-to-dagster-plus.md
index 715612374d783..bfa388af91c0b 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/migration/self-hosted-to-dagster-plus.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/migration/self-hosted-to-dagster-plus.md
@@ -1,5 +1,5 @@
 ---
 title: "Migrate from self-hosted to Dagster+"
-sidebar_position: 70
+sidebar_position: 10
 unlisted: true
 ---
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/serverless/ci-cd-in-serverless.md b/docs/docs-beta/docs/dagster-plus/deployment/serverless/ci-cd-in-serverless.md
index d6deb0c0c42bd..29ac255cc95d7 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/serverless/ci-cd-in-serverless.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/serverless/ci-cd-in-serverless.md
@@ -1,7 +1,7 @@
 ---
 title: 'CI/CD in Serverless '
 displayed_sidebar: 'dagsterPlus'
-sidebar_position: 10
+sidebar_position: 30
 ---
 
 # CI/CD in Serverless
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/serverless/dagster-ips.md b/docs/docs-beta/docs/dagster-plus/deployment/serverless/dagster-ips.md
index 8c517908c5cdb..eb364df3ee970 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/serverless/dagster-ips.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/serverless/dagster-ips.md
@@ -1,7 +1,7 @@
 ---
 title: 'IP addresses'
 displayed_sidebar: 'dagsterPlus'
-sidebar_position: 50
+sidebar_position: 40
 ---
 
 # Dagster+ Serverless IP addresses
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/serverless/index.md b/docs/docs-beta/docs/dagster-plus/deployment/serverless/index.md
index 898b657c26a55..7f5b421807e8f 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/serverless/index.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/serverless/index.md
@@ -1,7 +1,7 @@
 ---
 title: 'Serverless deployment'
 displayed_sidebar: 'dagsterPlus'
-sidebar_position: 1
+sidebar_position: 2
 ---
 
 # Serverless deployment
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/serverless/run-isolation.md b/docs/docs-beta/docs/dagster-plus/deployment/serverless/run-isolation.md
index 8efe4af99ff27..9a39a2f967ce8 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/serverless/run-isolation.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/serverless/run-isolation.md
@@ -2,7 +2,7 @@
 title: 'Serverless run isolation'
 displayed_sidebar: 'dagsterPlus'
 sidebar_label: 'Run isolation'
-sidebar_position: 35
+sidebar_position: 20
 ---
 
 # Serverless run isolation
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/serverless/runtime-environment.md b/docs/docs-beta/docs/dagster-plus/deployment/serverless/runtime-environment.md
index a1848dfe83877..7c6a1a1793651 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/serverless/runtime-environment.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/serverless/runtime-environment.md
@@ -2,7 +2,7 @@
 title: 'Serverless runtime environment'
 displayed_sidebar: 'dagsterPlus'
 sidebar_label: 'Runtime environment'
-sidebar_position: 30
+sidebar_position: 10
 ---
 
 By default, Dagster+ Serverless will package your code as PEX files and deploys them on Docker images. Using PEX files significantly reduces the time to deploy since it does not require building a new Docker image and provisioning a new container for every code change. However you are able to customize the Serverless runtime environment in various ways:
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/serverless/security.md b/docs/docs-beta/docs/dagster-plus/deployment/serverless/security.md
index 09f33964ac36e..24791eccac78c 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/serverless/security.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/serverless/security.md
@@ -1,7 +1,7 @@
 ---
 title: 'Security & data protection'
 displayed_sidebar: 'dagsterPlus'
-sidebar_position: 20
+sidebar_position: 50
 ---
 
 # Serverless security & data protection
diff --git a/docs/docs-beta/docs/dagster-plus/deployment/serverless/transition-hybrid.md b/docs/docs-beta/docs/dagster-plus/deployment/serverless/transition-hybrid.md
index 6790e20c2cbf5..780365c97c11a 100644
--- a/docs/docs-beta/docs/dagster-plus/deployment/serverless/transition-hybrid.md
+++ b/docs/docs-beta/docs/dagster-plus/deployment/serverless/transition-hybrid.md
@@ -1,7 +1,7 @@
 ---
 title: "Transitioning to Hybrid"
 displayed_sidebar: "dagsterPlus"
-sidebar_position: 50
+sidebar_position: 60
 ---
 
 After utilizing a Dagster+ [Serverless](/dagster-plus/deployment/serverless) deployment, you may decide to leverage your own infrastructure to execute your code. Transitioning to a Hybrid deployment requires only a few steps and can be done without any loss of execution history or metadata, allowing you to maintain continuity and control over your operations.
diff --git a/docs/docs-beta/sidebars.ts b/docs/docs-beta/sidebars.ts
index 60865e6547794..e8361b84be550 100644
--- a/docs/docs-beta/sidebars.ts
+++ b/docs/docs-beta/sidebars.ts
@@ -404,86 +404,8 @@ const sidebars: SidebarsConfig = {
       collapsible: false,
       items: [
         {
-          type: 'category',
-          label: 'Serverless',
-          link: {
-            type: 'doc',
-            id: 'dagster-plus/deployment/serverless/index',
-          },
-          items: [
-            'dagster-plus/deployment/serverless/runtime-environment',
-            'dagster-plus/deployment/serverless/run-isolation',
-            'dagster-plus/deployment/serverless/ci-cd-in-serverless',
-            'dagster-plus/deployment/serverless/dagster-ips',
-            'dagster-plus/deployment/serverless/security',
-            'dagster-plus/deployment/serverless/transition-hybrid'
-          ],
-        },
-        {
-          type: 'category',
-          label: 'Hybrid',
-          link: {
-            type: 'doc',
-            id: 'dagster-plus/deployment/hybrid/index',
-          },
-          items: [
-            {
-              type: 'doc',
-              label: 'Tokens',
-              id: 'dagster-plus/deployment/hybrid/tokens',
-            },
-            {
-              type: 'category',
-              label: 'Agents',
-              items: [
-                {
-                  type: 'autogenerated',
-                  dirName: 'dagster-plus/deployment/hybrid/agents',
-                },
-              ],
-            },
-          ],
-        },
-        {
-          type: 'category',
-          label: 'Migration',
-          items: [
-              'dagster-plus/deployment/migration/self-hosted-to-dagster-plus'
-          ],
-        },
-        {
-          type: 'category',
-          label: 'Code locations',
-          link: {
-            type: 'doc',
-            id: 'dagster-plus/deployment/code-locations/index',
-          },
-          items: [
-            'dagster-plus/deployment/code-locations/code-location-history'
-          ],
-        },
-        {
-          type: 'category',
-          label: 'Environment variables',
-          link: {
-            type: 'doc',
-            id: 'dagster-plus/deployment/environment-variables/index',
-          },
-          items: [
-            'dagster-plus/deployment/environment-variables/built-in',
-            'dagster-plus/deployment/environment-variables/dagster-ui',
-            'dagster-plus/deployment/environment-variables/agent-config'
-          ],
-        },
-        {
-          type: 'doc',
-          label: 'Deployment settings',
-          id: 'dagster-plus/deployment/deployment-settings',
-        },
-        {
-          type: 'doc',
-          label: 'Dagster+ settings',
-          id: 'dagster-plus/deployment/dagster-plus-settings',
+          type: 'autogenerated',
+          dirName: 'dagster-plus/deployment'
         }
       ],
     },