diff --git a/docs/docs.json b/docs/docs.json
index 36df0326d..051503f08 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -67,7 +67,6 @@
             "default": true,
             "groups": [
               { "group": "Start here", "pages": ["v6/index", "v6/quickstart", "v6/faq", "migrate-v6"] },
-              { "group": "Build", "pages": ["v6/build/environments", "v6/build/tasks"] },
               { "group": "Run & scale", "pages": ["v6/run/deploy", "v6/run/models", "v6/run/signal", "v6/run/training"] },
               { "group": "Reference", "pages": ["v6/reference/environment", "v6/reference/tasks", "v6/reference/capabilities", "v6/reference/agents", "v6/reference/robots", "v6/reference/graders", "v6/reference/training", "v6/reference/types", "v6/reference/cli"] },
               { "group": "Advanced", "pages": ["v6/advanced/integrations", "v6/advanced/subagents", "v6/advanced/chat", "v6/advanced/patterns", "v6/advanced/harbor-convert"] },
diff --git a/docs/v5/reference/cli/eval.mdx b/docs/v5/reference/cli/eval.mdx
index 325b12f76..8152218ea 100644
--- a/docs/v5/reference/cli/eval.mdx
+++ b/docs/v5/reference/cli/eval.mdx
@@ -261,7 +261,7 @@ hud cancel --all
 
 ## See Also
 
-- [Tasks Reference](/v5/reference/tasks) - Task configuration
+- [Tasks & Evaluation](/v5/building/tasks-and-evaluation) - Task configuration
 - [Agents Reference](/v5/reference/agents) - Agent options
 - [`hud rl`](/v5/reference/cli/rl) - RL training
 - [`hud cancel`](/v5/reference/cli/misc) - Cancel remote jobs
diff --git a/docs/v5/reference/cli/init.mdx b/docs/v5/reference/cli/init.mdx
index d8071cede..f3fbd88c1 100644
--- a/docs/v5/reference/cli/init.mdx
+++ b/docs/v5/reference/cli/init.mdx
@@ -128,7 +128,7 @@ hud deploy             # Build remotely & deploy to platform
 
 ## See Also
 
-- [Build Environments](/build-environments) – Quickstart tutorial
-- [Technical Spec](/build-environments/spec) – Exact runtime requirements
+- [Scaffolding Environments](/v5/building/scaffolding) – Quickstart tutorial
+- [Environments Reference](/v5/reference/environments) – Exact runtime requirements
 - [hud dev](/v5/reference/cli/dev) – Development server (`--watch` for hot-reload)
 - [hud build](/v5/reference/cli/build) – Build production images
diff --git a/docs/v5/reference/cli/push.mdx b/docs/v5/reference/cli/push.mdx
index 0454232d2..e60bf3ef4 100644
--- a/docs/v5/reference/cli/push.mdx
+++ b/docs/v5/reference/cli/push.mdx
@@ -126,4 +126,4 @@ push:
 
 - [`hud build`](/v5/reference/cli/build)
 - [`hud analyze`](/v5/reference/cli/analyze)
-- [Build Environments](/build-environments) - Getting started with HUD environments
+- [Scaffolding Environments](/v5/building/scaffolding) - Getting started with HUD environments
diff --git a/docs/v6/advanced/subagents.mdx b/docs/v6/advanced/subagents.mdx
index 22f35f807..906bb676c 100644
--- a/docs/v6/advanced/subagents.mdx
+++ b/docs/v6/advanced/subagents.mdx
@@ -54,7 +54,7 @@ env = Environment(
 )
 ```
 
-Run the FastMCP server alongside the environment so the URL is live — for local iteration, `tools.run(transport="http", host="127.0.0.1", port=8080)`; in a built image, start it from your container entrypoint or an [`@env.initialize`](/v6/build/environments#lifecycle-hooks) hook. See [Capabilities](/v6/reference/capabilities) for the `mcp` capability details.
+Run the FastMCP server alongside the environment so the URL is live — for local iteration, `tools.run(transport="http", host="127.0.0.1", port=8080)`; in a built image, start it from your container entrypoint or an [`@env.initialize`](/v6/reference/environment#lifecycle-hooks) hook. See [Capabilities](/v6/reference/capabilities) for the `mcp` capability details.
 
 ## How it looks to the orchestrator
 
diff --git a/docs/v6/reference/capabilities.mdx b/docs/v6/reference/capabilities.mdx
index 733ed0917..dc24ecb6d 100644
--- a/docs/v6/reference/capabilities.mdx
+++ b/docs/v6/reference/capabilities.mdx
@@ -281,7 +281,7 @@ The bundled provider agents open these automatically based on which capabilities
 ## See also
 
 <CardGroup cols={2}>
-<Card title="Environments" icon="cube" href="/v6/build/environments" />
+<Card title="Environments" icon="cube" href="/v6/reference/environment" />
 <Card title="Environment reference" icon="cube" href="/v6/reference/environment" />
 <Card title="Agents" icon="robot" href="/v6/reference/agents" />
 <Card title="Tasks & Tasksets" icon="list-check" href="/v6/reference/tasks" />