diff --git a/build/building/drivers/docker-container.md b/build/building/drivers/docker-container.md
index de11b89f52..5703fb490b 100644
--- a/build/building/drivers/docker-container.md
+++ b/build/building/drivers/docker-container.md
@@ -1,6 +1,8 @@
 ---
 title: "Docker container driver"
 keywords: build, buildx, driver, builder, docker-container
+redirect_from:
+- /build/buildx/drivers/docker-container/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/building/drivers/docker.md b/build/building/drivers/docker.md
index 8b263b3df4..c834fe6614 100644
--- a/build/building/drivers/docker.md
+++ b/build/building/drivers/docker.md
@@ -1,6 +1,8 @@
 ---
 title: "Docker driver"
 keywords: build, buildx, driver, builder, docker
+redirect_from:
+- /build/buildx/drivers/docker/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/building/drivers/index.md b/build/building/drivers/index.md
index 5e9f43edfa..970d18c85a 100644
--- a/build/building/drivers/index.md
+++ b/build/building/drivers/index.md
@@ -1,6 +1,8 @@
 ---
 title: "Drivers overview"
 keywords: build, buildx, driver, builder, docker-container, kubernetes, remote
+redirect_from:
+- /build/buildx/drivers/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/building/drivers/kubernetes.md b/build/building/drivers/kubernetes.md
index d89d6e7ac7..89f2dc723a 100644
--- a/build/building/drivers/kubernetes.md
+++ b/build/building/drivers/kubernetes.md
@@ -1,6 +1,8 @@
 ---
 title: "Kubernetes driver"
 keywords: build, buildx, driver, builder, kubernetes
+redirect_from:
+- /build/buildx/drivers/kubernetes/
 fetch_remote:
   line_start: 2
   line_end: -1
diff --git a/build/building/drivers/remote.md b/build/building/drivers/remote.md
index e3eb1cdccf..c81a0d4415 100644
--- a/build/building/drivers/remote.md
+++ b/build/building/drivers/remote.md
@@ -1,22 +1,9 @@
 ---
 title: "Remote driver"
 keywords: build, buildx, driver, builder, remote
+redirect_from:
+- /build/buildx/drivers/remote/
 fetch_remote:
   line_start: 2
   line_end: -1
 ---
-
-> Beta
->
-> Remote driver is currently available as a beta feature. We recommend that you
-> do not use this feature in production environments. You can [build Buildx from source](https://github.com/docker/buildx#building){: target="_blank" rel="noopener" class="_"}
-> to test the remote driver or use the following command to download and
-> install an edge release of Buildx:
-> 
-> ```console
-> $ echo "FROM docker/buildx-bin:master" | docker buildx build --platform=local --output . -f - .
-> $ mkdir -p ~/.docker/cli-plugins/
-> $ mv buildx ~/.docker/cli-plugins/docker-buildx
-> ```
-{: .important}
-