diff --git a/_config.yml b/_config.yml
index f0c33539ce..bfbd150234 100644
--- a/_config.yml
+++ b/_config.yml
@@ -165,7 +165,7 @@ fetch-remote:
     default_branch: "master"
     ref: "master"
     paths:
-      - dest: "build/bake"
+      - dest: "build/customize/bake"
         src:
           - "docs/guides/bake/**"
       - dest: "build/building/drivers"
diff --git a/_data/toc.yaml b/_data/toc.yaml
index bcadb58cfb..ef228ddfce 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -1405,26 +1405,28 @@ manuals:
               title: Remote driver
         - path: /build/building/multi-platform/
           title: Multi-platform images
+    - sectiontitle: Customizing builds
+      section:
+        - sectiontitle: Orchestrating builds with Bake
+          section:
+            - path: /build/customize/bake/
+              title: Overview
+            - path: /build/customize/bake/file-definition/
+              title: File definition
+            - path: /build/customize/bake/configuring-build/
+              title: Configuring builds
+            - path: /build/customize/bake/hcl-funcs/
+              title: User defined HCL functions
+            - path: /build/customize/bake/build-contexts/
+              title: Build contexts and linking targets
+            - path: /build/customize/bake/compose-file/
+              title: Building from Compose file
     - sectiontitle: Buildx
       section:
         - path: /build/buildx/install/
           title: Install Buildx
         - path: /build/buildx/multiple-builders/
           title: Using multiple builders
-    - sectiontitle: Bake
-      section:
-        - path: /build/bake/
-          title: Bake overview
-        - path: /build/bake/file-definition/
-          title: File definition
-        - path: /build/bake/configuring-build/
-          title: Configuring builds
-        - path: /build/bake/hcl-funcs/
-          title: User defined HCL functions
-        - path: /build/bake/build-contexts/
-          title: Build contexts and linking targets
-        - path: /build/bake/compose-file/
-          title: Building from Compose file
     - path: /build/release-notes/
       title: Release notes
 - sectiontitle: Docker Compose
diff --git a/build/bake/build-contexts.md b/build/customize/bake/build-contexts.md
similarity index 78%
rename from build/bake/build-contexts.md
rename to build/customize/bake/build-contexts.md
index 7026e6f005..556900ee52 100644
--- a/build/bake/build-contexts.md
+++ b/build/customize/bake/build-contexts.md
@@ -1,6 +1,8 @@
 ---
 title: "Defining additional build contexts and linking targets"
 keywords: build, buildx, bake, buildkit, hcl
+redirect_from:
+- /build/bake/build-contexts/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/bake/compose-file.md b/build/customize/bake/compose-file.md
similarity index 76%
rename from build/bake/compose-file.md
rename to build/customize/bake/compose-file.md
index d38ef185bd..9accdcbf67 100644
--- a/build/bake/compose-file.md
+++ b/build/customize/bake/compose-file.md
@@ -1,6 +1,8 @@
 ---
 title: "Building from Compose file"
 keywords: build, buildx, bake, buildkit, compose
+redirect_from:
+- /build/bake/compose-file/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/bake/configuring-build.md b/build/customize/bake/configuring-build.md
similarity index 73%
rename from build/bake/configuring-build.md
rename to build/customize/bake/configuring-build.md
index f56cc62bba..156750c519 100644
--- a/build/bake/configuring-build.md
+++ b/build/customize/bake/configuring-build.md
@@ -1,6 +1,8 @@
 ---
 title: "Configuring builds"
 keywords: build, buildx, bake, buildkit, hcl, json
+redirect_from:
+- /build/bake/configuring-build/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/bake/file-definition.md b/build/customize/bake/file-definition.md
similarity index 75%
rename from build/bake/file-definition.md
rename to build/customize/bake/file-definition.md
index 02fdb5c8b6..2ee188cedb 100644
--- a/build/bake/file-definition.md
+++ b/build/customize/bake/file-definition.md
@@ -1,6 +1,8 @@
 ---
 title: "Bake file definition"
 keywords: build, buildx, bake, buildkit, hcl, json, compose
+redirect_from:
+- /build/bake/file-definition/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/bake/hcl-funcs.md b/build/customize/bake/hcl-funcs.md
similarity index 77%
rename from build/bake/hcl-funcs.md
rename to build/customize/bake/hcl-funcs.md
index c4dde8f340..3773921185 100644
--- a/build/bake/hcl-funcs.md
+++ b/build/customize/bake/hcl-funcs.md
@@ -1,6 +1,8 @@
 ---
 title: "User defined HCL functions"
 keywords: build, buildx, bake, buildkit, hcl
+redirect_from:
+- /build/bake/hcl-funcs/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/bake/index.md b/build/customize/bake/index.md
similarity index 83%
rename from build/bake/index.md
rename to build/customize/bake/index.md
index 9f61a12efc..63f7a41c80 100644
--- a/build/bake/index.md
+++ b/build/customize/bake/index.md
@@ -1,6 +1,8 @@
 ---
 title: "High-level build options with Bake"
 keywords: build, buildx, bake, buildkit, hcl, json, compose
+redirect_from:
+- /build/bake/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/index.md b/build/index.md
index 67edb7b384..fad9ed9f8a 100644
--- a/build/index.md
+++ b/build/index.md
@@ -69,9 +69,9 @@ from the internet, or code build steps.
 Collaborate across platforms with one build artifact. See
 [Multi-platform images](building/multi-platform.md) page.
 
-## Automating your builds
+## Continuous integration
 
-### Integrating with GitHub
+### GitHub Actions
 
 Automate your image builds to run in GitHub actions using the official docker
 build actions:
@@ -79,12 +79,7 @@ build actions:
 * [GitHub Action to build and push Docker images with Buildx](https://github.com/docker/build-push-action).
 * [GitHub Action to extract metadata from Git reference and GitHub events](https://github.com/docker/metadata-action/).
 
-### Orchestrating builds across complex projects together
-
-Connect your builds together and easily parameterize your images using buildx bake.
-See [High-level build options with Bake](bake/index.md).
-
-## Customizing your Builds
+## Customizing your builds
 
 ### Select your build output format
 
@@ -96,6 +91,11 @@ like from BuildKit, not just docker images. See [Set the export action for the b
 Securely access protected repositories and resources at build time without
 leaking data into the final build or the cache.
 
+### Orchestrating builds using Bake
+
+Connect your builds together and easily parameterize your images using buildx bake.
+See [High-level build options with Bake](customize/bake/index.md).
+
 ## Extending BuildKit
 
 ### Custom syntax on Dockerfile
diff --git a/build/release-notes.md b/build/release-notes.md
index 53eb3c8873..efb93bb7cd 100644
--- a/build/release-notes.md
+++ b/build/release-notes.md
@@ -153,7 +153,7 @@ For more details, see the complete release notes in the [Buildx GitHub repositor
 
 * Build command now accepts `--build-context` flag to [define additional named build contexts](/engine/reference/commandline/buildx_build/#build-context)
   for your builds {% include github_issue.md repo="docker/buildx" number="904" %}
-* Bake definitions now support [defining dependencies between targets](bake/build-contexts.md)
+* Bake definitions now support [defining dependencies between targets](customize/bake/build-contexts.md)
   and using the result of one target in another build {% include github_issue.md repo="docker/buildx" number="928" %}
   {% include github_issue.md repo="docker/buildx" number="965" %} {% include github_issue.md repo="docker/buildx" number="963" %}
   {% include github_issue.md repo="docker/buildx" number="962" %} {% include github_issue.md repo="docker/buildx" number="981" %}
diff --git a/compose/compose-file/build.md b/compose/compose-file/build.md
index aa86248a9a..62d681ade3 100644
--- a/compose/compose-file/build.md
+++ b/compose/compose-file/build.md
@@ -430,4 +430,4 @@ services:
 ## Implementations
 
 * [docker-compose](../../compose/index.md)
-* [buildx bake](../../build/bake/index.md)
+* [buildx bake](../../build/customize/bake/index.md)