diff --git a/redirects-old-site.mjs b/redirects-old-site.mjs
index 87b845b2..913c7255 100644
--- a/redirects-old-site.mjs
+++ b/redirects-old-site.mjs
@@ -6,7 +6,7 @@ const redirectsOldSite = [
 	},
 	{
 		source: "/tutorial/react-components-to-gutenberg-blocks",
-		destination: "/docs/explanation/react-components-to-blocks/",
+		destination: "/docs/how-to/custom-blocks/",
 		permanent: true,
 	},
 	{
@@ -46,7 +46,7 @@ const redirectsOldSite = [
 	},
 	{
 		source: "/guide/how-to-use-apollo-in-faust",
-		destination: "/docs/how-to/use-wpgraphql-smart-cache/",
+		destination: "/docs/how-to/query-data-in-the-browser/",
 		permanent: true,
 	},
 	{
@@ -308,7 +308,7 @@ const redirectsOldSite = [
 	},
 	{
 		source: "/guide/how-to-use-the-faust-example-project",
-		destination: "/docs/",
+		destination: "/docs/tutorial/learn-faust/",
 		permanent: true,
 	},
 	{
diff --git a/src/pages/docs/explanation/deploy-your-app/index.mdx b/src/pages/docs/explanation/deploy-your-app/index.mdx
index b29e68a9..971ef724 100644
--- a/src/pages/docs/explanation/deploy-your-app/index.mdx
+++ b/src/pages/docs/explanation/deploy-your-app/index.mdx
@@ -14,7 +14,7 @@ Faust.js uses the `package.json` [engines field](https://docs.npmjs.com/cli/v9/c
 
 ## Building Your App
 
-Since Faust.js is built on top of Next.js, it shares the same build process. For details on how Next.js generates optimized production builds, refer to the [Next.js Build API](<(https://nextjs.org/docs/pages/building-your-application/deploying#nextjs-build-api)>) documentation. Additionally, you can explore the Headless Platform [framework guide](https://developers.wpengine.com/docs/atlas/framework-guides/next-js/next/) for Next.js apps.
+Since Faust.js is built on top of Next.js, it shares the same build process. For details on how Next.js generates optimized production builds, refer to the [Next.js Build API](https://nextjs.org/docs/pages/building-your-application/deploying#nextjs-build-api) documentation. Additionally, you can explore the Headless Platform [framework guide](https://developers.wpengine.com/docs/atlas/framework-guides/next-js/next/) for Next.js apps.
 
 ## Deploying to WP Engine's Headless Platform
 
diff --git a/src/pages/docs/how-to/rendering-blocks/index.mdx b/src/pages/docs/how-to/rendering-blocks/index.mdx
index 8c5b3f62..054d3e93 100644
--- a/src/pages/docs/how-to/rendering-blocks/index.mdx
+++ b/src/pages/docs/how-to/rendering-blocks/index.mdx
@@ -31,7 +31,7 @@ Activate the plugin on the WordPress plugins page.
 The `@faust/blocks` package contains a small reference list of core blocks that you can use in your site.
 
 > [!TIP]
-> These blocks are provided as a quick start option and reference. Blocks can be [overridden](/docs/how-to/override-blocks/) and [custom blocks](/docs/how-to/custom-blocks/) added to fit your site's needs.
+> These blocks are provided as a quick start option and reference. Blocks can be [overridden](/docs/how-to/custom-blocks/) and [custom blocks](/docs/how-to/custom-blocks/) added to fit your site's needs.
 
 ### A. Install the @faust/blocks package
 
diff --git a/src/pages/docs/reference/blockset/index.mdx b/src/pages/docs/reference/blockset/index.mdx
index 9d6f70d9..c7c3e0ad 100644
--- a/src/pages/docs/reference/blockset/index.mdx
+++ b/src/pages/docs/reference/blockset/index.mdx
@@ -42,7 +42,7 @@ wp-blocks
 ```
 
 > [!NOTE]
-> See our [React Components to Blocks](/docs/how-to/react-components-to-blocks/) how-to guide for more information on how to create React components that can be used as blocks in the Block Editor.
+> See our [React Components to Blocks](/docs/how-to/custom-blocks/) how-to guide for more information on how to create React components that can be used as blocks in the Block Editor.
 
 ## `blockset` Command Usage
 
diff --git a/src/pages/docs/tutorial/learn-faust/index.mdx b/src/pages/docs/tutorial/learn-faust/index.mdx
index b2b9c48c..c47b820f 100644
--- a/src/pages/docs/tutorial/learn-faust/index.mdx
+++ b/src/pages/docs/tutorial/learn-faust/index.mdx
@@ -417,7 +417,7 @@ Reload the http://localhost:3000/blog/hello-world/ page in your frontend app and
 More information about using Faust to render blocks, override WordPress core blocks with your own implementation, and even add support for custom blocks can be found in these how-to guides:
 
 - [Rendering Blocks](/docs/how-to/rendering-blocks/)
-- [Override Blocks](/docs/how-to/override-blocks/)
+- [Override Blocks](/docs/how-to/custom-blocks/)
 - [Custom Blocks](/docs/how-to/custom-blocks/)
 
 ## Next steps