diff --git a/content/manuals/_index.md b/content/manuals/_index.md
index 230f84d4bfc..67beb4b4009 100644
--- a/content/manuals/_index.md
+++ b/content/manuals/_index.md
@@ -9,34 +9,21 @@ params:
   icon: description
   sidebar:
     groups:
-      - Open source
-      - AI
-      - Products
+      - AI and agents
+      - Application development
+      - Supply chain security
       - Platform
       - Enterprise
   notoc: true
-  open-source:
-  - title: Docker Build
-    description: Build and ship any application anywhere.
-    icon: build
-    link: /build/
-  - title: Docker Engine
-    description: The industry-leading container runtime.
-    icon: developer_board
-    link: /engine/
-  - title: Docker Compose
-    description: Define and run multi-container applications.
-    icon: /icons/Compose.svg
-    link: /compose/
-  - title: Testcontainers
-    description: Run containers programmatically in your preferred programming language.
-    icon: /icons/Testcontainers.svg
-    link: /testcontainers/
-  - title: Docker Agent
-    description: The open-source multi-agent solution to assist you in your tasks.
-    icon: /icons/cagent.svg
-    link: /ai/docker-agent
-  ai:
+  ai-and-agents:
+  - title: Docker Sandboxes
+    description: Run AI coding agents in isolated environments.
+    icon: terminal
+    link: /ai/sandboxes/
+  - title: MCP Catalog and Toolkit
+    description: Augment your AI workflow with MCP servers.
+    icon: /icons/toolkit.svg
+    link: /ai/mcp-catalog-and-toolkit/
   - title: Gordon
     description: Streamline your workflow and get the most out of the Docker ecosystem with your personal AI assistant.
     icon: note_add
@@ -45,43 +32,52 @@ params:
     description: View and manage your local models.
     icon: /icons/models.svg
     link: /ai/model-runner/
-  - title: MCP Catalog and Toolkit
-    description: Augment your AI workflow with MCP servers.
-    icon: /icons/toolkit.svg
-    link: /ai/mcp-catalog-and-toolkit/
-  products:
+  - title: Docker Agent
+    description: The open-source multi-agent solution to assist you in your tasks.
+    icon: /icons/cagent.svg
+    link: /ai/docker-agent
+  application-development:
   - title: Docker Desktop
     description: Your command center for container development.
     icon: /icons/Whale.svg
     link: /desktop/
-  - title: Docker Hardened Images
-    description: Secure, minimal images for trusted software delivery.
-    icon: /icons/dhi.svg
-    link: /dhi/
   - title: Docker Offload
     description: Build and run containers in the cloud.
     icon: cloud
     link: /offload/
-  - title: Build Cloud
+  - title: Docker Build Cloud
     description: Build your images faster in the cloud.
     icon: /icons/logo-build-cloud.svg
     link: /build-cloud/
+  - title: Testcontainers
+    description: Run containers programmatically in your preferred programming language.
+    icon: /icons/Testcontainers.svg
+    link: /testcontainers/
+  - title: Docker Build
+    description: Build and ship any application anywhere.
+    icon: build
+    link: /build/
+  - title: Docker Engine
+    description: The industry-leading container runtime.
+    icon: developer_board
+    link: /engine/
+  - title: Docker Compose
+    description: Define and run multi-container applications.
+    icon: /icons/Compose.svg
+    link: /compose/
+  supply-chain-security:
   - title: Docker Hub
     description: Discover, share, and integrate container images.
     icon: hub
     link: /docker-hub/
+  - title: Docker Hardened Images
+    description: Secure, minimal images for trusted software delivery.
+    icon: /icons/dhi.svg
+    link: /dhi/
   - title: Docker Scout
     description: Image analysis and policy evaluation.
     icon: /icons/Scout.svg
     link: /scout/
-  - title: Docker Extensions
-    description: Customize your Docker Desktop workflow.
-    icon: extension
-    link: /extensions/
-  - title: Testcontainers Cloud
-    description: Run integration tests, with real dependencies, in the cloud.
-    icon: package_2
-    link: https://testcontainers.com/cloud/docs/
   platform:
   - title: Administration
     description: Centralized observability for companies and organizations.
@@ -113,23 +109,23 @@ params:
 This section contains user guides on how to install, set up, configure, and use
 Docker products.
 
-## Open source
+## AI and agents
 
-Open source development and containerization technologies.
+All the Docker AI tools in one easy-to-access location.
 
-{{< grid items=open-source >}}
+{{< grid items=ai-and-agents >}}
 
-## AI
+## Application development
 
-All the Docker AI tools in one easy-to-access location.
+End-to-end developer solutions for innovative teams.
 
-{{< grid items=ai >}}
+{{< grid items=application-development >}}
 
-## Products
+## Supply chain security
 
-End-to-end developer solutions for innovative teams.
+Security guardrails and image analysis for your software supply chain.
 
-{{< grid items=products >}}
+{{< grid items=supply-chain-security >}}
 
 ## Platform
 
@@ -143,3 +139,4 @@ subscription management.
 Targeted at IT administrators with help on deploying Docker Desktop at scale with configuration guidance on security related features.
 
 {{< grid items=enterprise >}}
+
diff --git a/content/manuals/ai-overview.md b/content/manuals/ai-overview.md
index 81c6b1f38fc..9597a324a68 100644
--- a/content/manuals/ai-overview.md
+++ b/content/manuals/ai-overview.md
@@ -6,7 +6,7 @@ weight: 1
 keywords: docker, ai, gordon, docker agent, sandboxes, model runner, mcp
 params:
   sidebar:
-    group: AI
+    group: AI and agents
 ---
 
 Docker provides tools for working with AI across your development workflow.
diff --git a/content/manuals/ai/compose/_index.md b/content/manuals/ai/compose/_index.md
index 45e017bcaf0..0f290544094 100644
--- a/content/manuals/ai/compose/_index.md
+++ b/content/manuals/ai/compose/_index.md
@@ -5,5 +5,5 @@ title: AI and Docker Compose
 weight: 50
 params:
   sidebar:
-    group: AI
+    group: AI and agents
 ---
diff --git a/content/manuals/ai/docker-agent/_index.md b/content/manuals/ai/docker-agent/_index.md
index 4352ece7d51..c3b6ecadb2d 100644
--- a/content/manuals/ai/docker-agent/_index.md
+++ b/content/manuals/ai/docker-agent/_index.md
@@ -7,7 +7,7 @@ aliases:
   - /manuals/ai/cagent/
 params:
   sidebar:
-    group: Open source
+    group: AI and agents
     badge:
       color: violet
       text: Experimental
diff --git a/content/manuals/ai/gordon/_index.md b/content/manuals/ai/gordon/_index.md
index 51b6c61e78e..b4ee2dee9ef 100644
--- a/content/manuals/ai/gordon/_index.md
+++ b/content/manuals/ai/gordon/_index.md
@@ -9,7 +9,7 @@ params:
     badge:
       color: blue
       text: Beta
-    group: AI
+    group: AI and agents
 aliases:
   - /desktop/features/gordon/
 ---
diff --git a/content/manuals/ai/mcp-catalog-and-toolkit/_index.md b/content/manuals/ai/mcp-catalog-and-toolkit/_index.md
index 02b2940e642..891b35f08a7 100644
--- a/content/manuals/ai/mcp-catalog-and-toolkit/_index.md
+++ b/content/manuals/ai/mcp-catalog-and-toolkit/_index.md
@@ -3,11 +3,11 @@ title: Docker MCP Catalog and Toolkit
 linkTitle: MCP Catalog and Toolkit
 params:
   sidebar:
-    group: AI
+    group: AI and agents
     badge:
       color: blue
       text: Beta
-weight: 10
+weight: 20
 description: Learn about Docker's MCP catalog on Docker Hub
 keywords: Docker, ai, mcp servers, ai agents, extension, docker desktop, llm, docker hub
 grid:
diff --git a/content/manuals/ai/model-runner/_index.md b/content/manuals/ai/model-runner/_index.md
index 16e86e6c9f5..8ca4c4bb233 100644
--- a/content/manuals/ai/model-runner/_index.md
+++ b/content/manuals/ai/model-runner/_index.md
@@ -3,7 +3,7 @@ title: Docker Model Runner
 linkTitle: Model Runner
 params:
   sidebar:
-    group: AI
+    group: AI and agents
 weight: 30
 description: Learn how to use Docker Model Runner to manage and run AI models.
 keywords: Docker, ai, model runner, docker desktop, docker engine, llm, openai, ollama, llama.cpp, vllm, diffusers, cpu, nvidia, cuda, amd, rocm, vulkan, cline, continue, cursor, image generation, stable diffusion
diff --git a/content/manuals/ai/sandboxes/_index.md b/content/manuals/ai/sandboxes/_index.md
index 7aac1a88d34..f9560cbfaf2 100644
--- a/content/manuals/ai/sandboxes/_index.md
+++ b/content/manuals/ai/sandboxes/_index.md
@@ -2,10 +2,10 @@
 title: Docker Sandboxes
 description: Run AI coding agents in isolated environments
 keywords: docker sandboxes, sbx, ai agents, sandboxed agents, microVM
-weight: 20
+weight: 10
 params:
   sidebar:
-    group: AI
+    group: AI and agents
     badge:
       color: blue
       text: Early Access
diff --git a/content/manuals/build-cloud/_index.md b/content/manuals/build-cloud/_index.md
index 8a42cf72246..85a2308b52b 100644
--- a/content/manuals/build-cloud/_index.md
+++ b/content/manuals/build-cloud/_index.md
@@ -5,7 +5,7 @@ description: Find documentation on Docker Build Cloud to help you build your con
 keywords: build, cloud, cloud build, remote builder
 params:
   sidebar:
-    group: Products
+    group: Application development
 aliases:
   - /build/cloud/faq/
   - /build/cloud/
diff --git a/content/manuals/build/_index.md b/content/manuals/build/_index.md
index c4af3ceb1af..a496238071a 100644
--- a/content/manuals/build/_index.md
+++ b/content/manuals/build/_index.md
@@ -5,7 +5,7 @@ description: Get an overview of Docker Build to package and bundle your code and
 keywords: build, buildx, buildkit
 params:
   sidebar:
-    group: Open source
+    group: Application development
 grid:
 - title: Packaging your software
   description: 'Build and package your application to run it anywhere: locally or
diff --git a/content/manuals/compose/_index.md b/content/manuals/compose/_index.md
index 29f143ef44e..4a4de3d1b14 100644
--- a/content/manuals/compose/_index.md
+++ b/content/manuals/compose/_index.md
@@ -6,7 +6,7 @@ description: Learn how to use Docker Compose to define and run multi-container a
 keywords: docker compose, docker-compose, compose.yaml, docker compose command, multi-container applications, container orchestration, docker cli
 params:
   sidebar:
-    group: Open source
+    group: Application development
 grid:
 - title: Why use Compose?
   description: Understand Docker Compose's key benefits
diff --git a/content/manuals/desktop/_index.md b/content/manuals/desktop/_index.md
index 9823c7fc704..7ed3c232805 100644
--- a/content/manuals/desktop/_index.md
+++ b/content/manuals/desktop/_index.md
@@ -6,7 +6,7 @@ keywords: how to use docker desktop, what is docker desktop used for, what does
   desktop do, using docker desktop
 params:
   sidebar:
-    group: Products
+    group: Application development
 grid:
 - title: Install Docker Desktop
   description: |
diff --git a/content/manuals/dhi/_index.md b/content/manuals/dhi/_index.md
index 0781a7673d4..130c77daabf 100644
--- a/content/manuals/dhi/_index.md
+++ b/content/manuals/dhi/_index.md
@@ -4,7 +4,7 @@ description: Secure, minimal, and production-ready base images
 weight: 8
 params:
   sidebar:
-    group: Products
+    group: Supply chain security
     badge:
       color: green
       text: New
diff --git a/content/manuals/docker-hub/_index.md b/content/manuals/docker-hub/_index.md
index 4d0df196c2f..07c4ccfc781 100644
--- a/content/manuals/docker-hub/_index.md
+++ b/content/manuals/docker-hub/_index.md
@@ -5,7 +5,7 @@ title: Docker Hub
 weight: 30
 params:
   sidebar:
-    group: Products
+    group: Supply chain security
 grid:
 - title: Quickstart
   description: Step-by-step instructions on getting started on Docker Hub.
diff --git a/content/manuals/engine/_index.md b/content/manuals/engine/_index.md
index 9c67356c4f8..846416706f8 100644
--- a/content/manuals/engine/_index.md
+++ b/content/manuals/engine/_index.md
@@ -5,7 +5,7 @@ description: Find a comprehensive overview of Docker Engine, including how to in
 keywords: Engine
 params:
   sidebar:
-    group: Open source
+    group: Application development
 grid:
 - title: Install Docker Engine
   description: Learn how to install the open source Docker Engine for your distribution.
diff --git a/content/manuals/extensions/_index.md b/content/manuals/extensions/_index.md
index 16d857332ea..0e0cf3da144 100644
--- a/content/manuals/extensions/_index.md
+++ b/content/manuals/extensions/_index.md
@@ -5,7 +5,7 @@ description: Extensions
 keywords: Docker Extensions, Docker Desktop, Linux, Mac, Windows
 params:
   sidebar:
-    group: Products
+    group: Application development
 aliases:
  - /desktop/extensions/
 ---
diff --git a/content/manuals/offload/_index.md b/content/manuals/offload/_index.md
index 2281f462905..7e750e36a58 100644
--- a/content/manuals/offload/_index.md
+++ b/content/manuals/offload/_index.md
@@ -5,7 +5,7 @@ description: Find documentation on Docker Offload to help you offload containers
 keywords: build, cloud, cloud build, remote builder
 params:
   sidebar:
-    group: Products
+    group: Application development
 
 grid:
 
diff --git a/content/manuals/release-lifecycle.md b/content/manuals/release-lifecycle.md
index 4b54d2cc3c3..fc90321ae5d 100644
--- a/content/manuals/release-lifecycle.md
+++ b/content/manuals/release-lifecycle.md
@@ -6,7 +6,7 @@ description: Describes the various stages of feature lifecycle from beta
 keywords: beta, GA, Early Access,
 params:
   sidebar:
-    group: Products
+    group: Application development
 ---
 
 This page details Docker's product release lifecycle and how Docker defines each stage. It also provides information on the product retirement process. Features and products may progress through some or all of these phases. 
diff --git a/content/manuals/retired.md b/content/manuals/retired.md
index ded44c4146a..afeba4b8abf 100644
--- a/content/manuals/retired.md
+++ b/content/manuals/retired.md
@@ -7,7 +7,7 @@ description: |
 keywords: deprecated, retired, docker products, docker features, legacy
 params:
   sidebar:
-    group: Products
+    group: Application development
 aliases:
   - /docker-hub/service-accounts/
   - /cloud/
diff --git a/content/manuals/scout/_index.md b/content/manuals/scout/_index.md
index 6d7dbb2f8cb..d80a9f2a59b 100644
--- a/content/manuals/scout/_index.md
+++ b/content/manuals/scout/_index.md
@@ -8,7 +8,7 @@ aliases:
   - /engine/scan/
 params:
   sidebar:
-    group: Products
+    group: Supply chain security
 grid:
   - title: Quickstart
     link: /scout/quickstart/