diff --git a/docs/site/app/_components/not-found-template.tsx b/docs/site/app/_components/not-found-template.tsx
index bb31f801c1103..4204ecb426c3f 100644
--- a/docs/site/app/_components/not-found-template.tsx
+++ b/docs/site/app/_components/not-found-template.tsx
@@ -13,9 +13,7 @@ export function NotFoundTemplate({
       <div className="flex justify-center pb-24">
         <Turborepo />
       </div>
-      <h1 className="text-2xl text-center font-bold pb-10">
-        Lost in the Turboverse...
-      </h1>
+      <h1 className="text-2xl text-center font-bold pb-4">404</h1>
       {content ? (
         content
       ) : (
diff --git a/docs/site/next.config.ts b/docs/site/next.config.ts
index 3bae29ab17324..4fcc45aaf5f10 100644
--- a/docs/site/next.config.ts
+++ b/docs/site/next.config.ts
@@ -545,6 +545,53 @@ const config: NextConfig = {
         destination: "/docs/guides/ci-vendors/travis-ci",
         permanent: true,
       },
+      {
+        source: "/remote-cache",
+        destination: "/docs/core-concepts/remote-caching",
+        permanent: true,
+      },
+      {
+        source: "/docs/troubleshooting",
+        destination: "/docs/reference",
+        permanent: true,
+      },
+      {
+        source: "/docs/platform-environment-variables",
+        destination:
+          "/docs/crafting-your-repository/using-environment-variables#platform-environment-variables",
+        permanent: true,
+      },
+      {
+        source: "/docs/platform-environment-variables",
+        destination:
+          "/docs/crafting-your-repository/using-environment-variables#platform-environment-variables",
+        permanent: true,
+      },
+      {
+        source: "/docs/handbook",
+        destination: "/docs/crafting-your-repository",
+        permanent: true,
+      },
+      {
+        source: "/docs/reference/codemods",
+        destination: "/docs/reference/turbo-codemod",
+        permanent: true,
+      },
+      {
+        source: "/docs/getting-started/from-example",
+        destination: "/docs/getting-started/examples",
+        permanent: true,
+      },
+      {
+        source: "/docs/getting-started/create-new",
+        destination: "/docs/getting-started/installation",
+        permanent: true,
+      },
+      {
+        source: "/docs/reference/command-line-reference/run",
+        destination: "/docs/reference/run",
+        permanent: true,
+      },
     ];
   },
 };