diff --git a/content/get-started/docker-concepts/building-images/build-tag-and-publish-an-image.md b/content/get-started/docker-concepts/building-images/build-tag-and-publish-an-image.md
index 820ac10f52..b34d56d5fc 100644
--- a/content/get-started/docker-concepts/building-images/build-tag-and-publish-an-image.md
+++ b/content/get-started/docker-concepts/building-images/build-tag-and-publish-an-image.md
@@ -221,9 +221,9 @@ Now that you have an image built, it's time to push the image to a registry.
 To learn more about building, tagging, and publishing images, visit the following resources:
 
 * [What is a build context?](/build/concepts/context/#what-is-a-build-context)
-* [docker build reference](/engine/reference/commandline/image_build/)
-* [docker image tag reference](/engine/reference/commandline/image_tag/)
-* [docker push reference](/engine/reference/commandline/image_push/)
+* [docker build reference](/reference/cli/docker/buildx/build/)
+* [docker image tag reference](/reference/cli/docker/image/tag/)
+* [docker push reference](/reference/cli/docker/image/push/)
 * [What is a registry?](/get-started/docker-concepts/the-basics/what-is-a-registry/)
 
 ## Next steps
diff --git a/content/get-started/docker-concepts/building-images/writing-a-dockerfile.md b/content/get-started/docker-concepts/building-images/writing-a-dockerfile.md
index 3608f7a7ed..84e60f5818 100644
--- a/content/get-started/docker-concepts/building-images/writing-a-dockerfile.md
+++ b/content/get-started/docker-concepts/building-images/writing-a-dockerfile.md
@@ -152,7 +152,7 @@ Now that you have the project, you’re ready to create the `Dockerfile`.
 > The `docker init` command will analyze your project and quickly create 
 > a Dockerfile, a `compose.yaml`, and a `.dockerignore`, helping you get
 > up and going. Since you're learning about Dockerfiles specifically here, 
-> you won't use it now. But, [learn more about it here](/engine/reference/commandline/init/).
+> you won't use it now. But, [learn more about it here](/reference/cli/docker/init/).
 
 ## Additional resources
 
diff --git a/content/get-started/docker-concepts/the-basics/what-is-docker-compose.md b/content/get-started/docker-concepts/the-basics/what-is-docker-compose.md
index c0c6000206..02d8b3434a 100644
--- a/content/get-started/docker-concepts/the-basics/what-is-docker-compose.md
+++ b/content/get-started/docker-concepts/the-basics/what-is-docker-compose.md
@@ -138,5 +138,5 @@ This page was a brief introduction to Compose. In the following resources, you c
 
 
 * [Overview of Docker Compose](/compose/)
-* [Overview of Docker Compose CLI](/compose/reference/)
+* [Overview of Docker Compose CLI](/reference/cli/docker/compose/)
 * [How Compose works](/compose/intro/compose-application-model/)
diff --git a/content/guides/angular/containerize.md b/content/guides/angular/containerize.md
index d7f1d110c1..722f6fa82e 100644
--- a/content/guides/angular/containerize.md
+++ b/content/guides/angular/containerize.md
@@ -567,8 +567,8 @@ Explore official references and best practices to sharpen your Docker workflow:
 - [Best practices for writing Dockerfiles](/develop/develop-images/dockerfile_best-practices/) – Write efficient, maintainable, and secure Dockerfiles.  
 - [Build context in Docker](/build/concepts/context/) – Learn how context affects image builds.  
 - [`docker init` CLI reference](/reference/cli/docker/init/) – Scaffold Docker assets automatically.
-- [`docker build` CLI reference](/reference/cli/docker/build/) – Build Docker images from a Dockerfile.
-- [`docker images` CLI reference](/reference/cli/docker/images/) – Manage and inspect local Docker images.
+- [`docker build` CLI reference](/reference/cli/docker/image/build/) – Build Docker images from a Dockerfile.
+- [`docker images` CLI reference](/reference/cli/docker/image/ls/) – Manage and inspect local Docker images.
 - [`docker compose up` CLI reference](/reference/cli/docker/compose/up/) – Start and run multi-container applications.
 - [`docker compose down` CLI reference](/reference/cli/docker/compose/down/) – Stop and remove containers, networks, and volumes.
 
diff --git a/content/guides/angular/run-tests.md b/content/guides/angular/run-tests.md
index 5f5dd68f2f..5cd4cf74ad 100644
--- a/content/guides/angular/run-tests.md
+++ b/content/guides/angular/run-tests.md
@@ -94,7 +94,7 @@ $ docker compose run --rm angular-test
 This command will:
 - Start the `angular-test` service defined in your `compose.yaml` file.
 - Execute the `npm run test` script using the same environment as development.
-- Automatically removes the container after tests complete, using the [`docker compose run --rm`](/engine/reference/commandline/compose_run) command.
+- Automatically removes the container after tests complete, using the [`docker compose run --rm`](/reference/cli/docker/compose/run/) command.
 
 You should see output similar to the following:
 
diff --git a/content/guides/docker-compose/_index.md b/content/guides/docker-compose/_index.md
index 2763f12c43..83dc7aa797 100644
--- a/content/guides/docker-compose/_index.md
+++ b/content/guides/docker-compose/_index.md
@@ -13,7 +13,7 @@ params:
   time: 10 minutes
   resource_links:
     - title: Overview of Docker Compose CLI
-      url: /compose/reference/
+      url: /reference/cli/docker/compose/
     - title: Overview of Docker Compose
       url: /compose/
     - title: How Compose works
diff --git a/content/guides/nodejs/containerize.md b/content/guides/nodejs/containerize.md
index 75c4cc685c..796fa790d6 100644
--- a/content/guides/nodejs/containerize.md
+++ b/content/guides/nodejs/containerize.md
@@ -861,8 +861,8 @@ Explore official references and best practices to sharpen your Docker workflow:
 - [Best practices for writing Dockerfiles](/develop/develop-images/dockerfile_best-practices/) – Write efficient, maintainable, and secure Dockerfiles.
 - [Build context in Docker](/build/concepts/context/) – Learn how context affects image builds.
 - [`docker init` CLI reference](/reference/cli/docker/init/) – Scaffold Docker assets automatically.
-- [`docker build` CLI reference](/reference/cli/docker/build/) – Build Docker images from a Dockerfile.
-- [`docker images` CLI reference](/reference/cli/docker/images/) – Manage and inspect local Docker images.
+- [`docker build` CLI reference](/reference/cli/docker/image/build/) – Build Docker images from a Dockerfile.
+- [`docker images` CLI reference](/reference/cli/docker/image/ls/) – Manage and inspect local Docker images.
 - [`docker compose up` CLI reference](/reference/cli/docker/compose/up/) – Start and run multi-container applications.
 - [`docker compose down` CLI reference](/reference/cli/docker/compose/down/) – Stop and remove containers, networks, and volumes.
 
diff --git a/content/guides/reactjs/containerize.md b/content/guides/reactjs/containerize.md
index aa7c0f1157..fe53509b78 100644
--- a/content/guides/reactjs/containerize.md
+++ b/content/guides/reactjs/containerize.md
@@ -547,8 +547,8 @@ Explore official references and best practices to sharpen your Docker workflow:
 - [Best practices for writing Dockerfiles](/develop/develop-images/dockerfile_best-practices/) – Write efficient, maintainable, and secure Dockerfiles.  
 - [Build context in Docker](/build/concepts/context/) – Learn how context affects image builds.  
 - [`docker init` CLI reference](/reference/cli/docker/init/) – Scaffold Docker assets automatically.
-- [`docker build` CLI reference](/reference/cli/docker/build/) – Build Docker images from a Dockerfile.
-- [`docker images` CLI reference](/reference/cli/docker/images/) – Manage and inspect local Docker images.
+- [`docker build` CLI reference](/reference/cli/docker/image/build/) – Build Docker images from a Dockerfile.
+- [`docker images` CLI reference](/reference/cli/docker/image/ls/) – Manage and inspect local Docker images.
 - [`docker compose up` CLI reference](/reference/cli/docker/compose/up/) – Start and run multi-container applications.
 - [`docker compose down` CLI reference](/reference/cli/docker/compose/down/) – Stop and remove containers, networks, and volumes.
 
diff --git a/content/guides/reactjs/run-tests.md b/content/guides/reactjs/run-tests.md
index 9494059e42..2c319b165c 100644
--- a/content/guides/reactjs/run-tests.md
+++ b/content/guides/reactjs/run-tests.md
@@ -144,7 +144,7 @@ $ docker compose run --rm react-test
 This command will:
 - Start the `react-test` service defined in your `compose.yaml` file.
 - Execute the `npm run test` script using the same environment as development.
-- Automatically remove the container after the tests complete [`docker compose run --rm`](/engine/reference/commandline/compose_run) command.
+- Automatically remove the container after the tests complete [`docker compose run --rm`](/reference/cli/docker/compose/run/) command.
 
 > [!NOTE]
 > For more information about Compose commands, see the [Compose CLI
diff --git a/content/guides/vuejs/containerize.md b/content/guides/vuejs/containerize.md
index a0abea8475..2c8211ebb8 100644
--- a/content/guides/vuejs/containerize.md
+++ b/content/guides/vuejs/containerize.md
@@ -569,8 +569,8 @@ Explore official references and best practices to sharpen your Docker workflow:
 - [Best practices for writing Dockerfiles](/develop/develop-images/dockerfile_best-practices/) – Write efficient, maintainable, and secure Dockerfiles.  
 - [Build context in Docker](/build/concepts/context/) – Learn how context affects image builds.  
 - [`docker init` CLI reference](/reference/cli/docker/init/) – Scaffold Docker assets automatically.
-- [`docker build` CLI reference](/reference/cli/docker/build/) – Build Docker images from a Dockerfile.
-- [`docker images` CLI reference](/reference/cli/docker/images/) – Manage and inspect local Docker images.
+- [`docker build` CLI reference](/reference/cli/docker/image/build/) – Build Docker images from a Dockerfile.
+- [`docker images` CLI reference](/reference/cli/docker/image/ls/) – Manage and inspect local Docker images.
 - [`docker compose up` CLI reference](/reference/cli/docker/compose/up/) – Start and run multi-container applications.
 - [`docker compose down` CLI reference](/reference/cli/docker/compose/down/) – Stop and remove containers, networks, and volumes.
 
diff --git a/content/guides/vuejs/run-tests.md b/content/guides/vuejs/run-tests.md
index 7c1a2a013a..2f0e3636bd 100644
--- a/content/guides/vuejs/run-tests.md
+++ b/content/guides/vuejs/run-tests.md
@@ -95,7 +95,7 @@ $ docker compose run --rm vuejs-test
 This command will:
 - Start the `vuejs-test` service defined in your `compose.yaml` file.
 - Execute the `npm run test` script using the same environment as development.
-- Automatically remove the container after the tests complete [`docker compose run --rm`](/engine/reference/commandline/compose_run) command.
+- Automatically remove the container after the tests complete [`docker compose run --rm`](/reference/cli/docker/compose/run/) command.
 
 You should see output similar to the following:
 
diff --git a/content/manuals/build/building/best-practices.md b/content/manuals/build/building/best-practices.md
index 318c8f25a2..77de261aad 100644
--- a/content/manuals/build/building/best-practices.md
+++ b/content/manuals/build/building/best-practices.md
@@ -631,7 +631,7 @@ as part of your build. `ADD` is better than manually adding files using
 something like `wget` and `tar`, because it ensures a more precise build cache.
 `ADD` also has built-in support for checksum validation of the remote
 resources, and a protocol for parsing branches, tags, and subdirectories from
-[Git URLs](/reference/cli/docker/buildx/build/#git-repositories).
+[Git URLs](/reference/cli/docker/buildx/build/).
 
 The following example uses `ADD` to download a .NET installer. Combined with
 multi-stage builds, only the .NET runtime remains in the final stage, no
diff --git a/content/manuals/build/building/secrets.md b/content/manuals/build/building/secrets.md
index 0271c19a25..eb0856aeef 100644
--- a/content/manuals/build/building/secrets.md
+++ b/content/manuals/build/building/secrets.md
@@ -85,7 +85,7 @@ builds, such as API tokens, passwords, or SSH keys.
 
 The source of a secret can be either a
 [file](/reference/cli/docker/buildx/build/#file) or an
-[environment variable](/reference/cli/docker/buildx/build/#env).
+[environment variable](/reference/cli/docker/buildx/build/#typeenv).
 When you use the CLI or Bake, the type can be detected automatically. You can
 also specify it explicitly with `type=file` or `type=env`.
 
diff --git a/content/manuals/compose/how-tos/environment-variables/envvars.md b/content/manuals/compose/how-tos/environment-variables/envvars.md
index cfbd715339..e2ad859dd7 100644
--- a/content/manuals/compose/how-tos/environment-variables/envvars.md
+++ b/content/manuals/compose/how-tos/environment-variables/envvars.md
@@ -66,7 +66,7 @@ underscores, and must begin with a lowercase letter or decimal digit. If the
 `basename` of the project directory or current directory violates this
 constraint, you must use one of the other mechanisms.
 
-See also the [command-line options overview](/reference/cli/docker/compose/#command-options-overview-and-help) and [using `-p` to specify a project name](/reference/cli/docker/compose/#use--p-to-specify-a-project-name).
+See also [using `-p` to specify a project name](/reference/cli/docker/compose/#use--p-to-specify-a-project-name).
 
 #### COMPOSE\_FILE
 
@@ -83,7 +83,7 @@ Specifies the path to a Compose file. Specifying multiple Compose files is suppo
       ```  
    The path separator can also be customized using [`COMPOSE_PATH_SEPARATOR`](#compose_path_separator).  
 
-See also the [command-line options overview](/reference/cli/docker/compose/#command-options-overview-and-help) and [using `-f` to specify name and path of one or more Compose files](/reference/cli/docker/compose/#use--f-to-specify-the-name-and-path-of-one-or-more-compose-files).
+See also [using `-f` to specify name and path of one or more Compose files](/reference/cli/docker/compose/#use--f-to-specify-the-name-and-path-of-one-or-more-compose-files).
 
 #### COMPOSE\_PROFILES
 
diff --git a/content/manuals/desktop/use-desktop/container.md b/content/manuals/desktop/use-desktop/container.md
index 3cecc3b2ca..1017939ebc 100644
--- a/content/manuals/desktop/use-desktop/container.md
+++ b/content/manuals/desktop/use-desktop/container.md
@@ -66,7 +66,7 @@ Using the **Exec** tab is the same as running one of the following commands:
 - `docker exec -it <container-id> /bin/sh`
 - `docker exec -it <container-id> cmd.exe` when accessing Windows containers
 
-For more details, see the [`docker exec` CLI reference](/reference/cli/docker/exec/).
+For more details, see the [`docker exec` CLI reference](/reference/cli/docker/container/exec/).
 
 If you have enabled Docker Debug in settings, or toggled on **Debug mode** to the right of the tab options, the **Debug** tab displays. 
 
diff --git a/content/manuals/engine/network/drivers/overlay.md b/content/manuals/engine/network/drivers/overlay.md
index 7b8b82087c..e9f2daafc0 100644
--- a/content/manuals/engine/network/drivers/overlay.md
+++ b/content/manuals/engine/network/drivers/overlay.md
@@ -48,7 +48,7 @@ participating in an overlay network:
 
 | Ports                  | Description                                                                                                                                             |
 | :--------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `2377/tcp`             | The default Swarm control plane port, is configurable with [`docker swarm join --listen-addr`](/reference/cli/docker/swarm/join/#--listen-addr-value) |
+| `2377/tcp`             | The default Swarm control plane port, is configurable with [`docker swarm join --listen-addr`](/reference/cli/docker/swarm/join/#listen-addr) |
 | `4789/udp`             | The default overlay traffic port, configurable with [`docker swarm init --data-path-addr`](/reference/cli/docker/swarm/init/#data-path-port)          |
 | `7946/tcp`, `7946/udp` | Used for communication among nodes, not configurable                                                                                                    |