diff --git a/macros/serverless/container-registry-note.mdx b/macros/serverless/container-registry-note.mdx
index 91707fa61f..a745bca59f 100644
--- a/macros/serverless/container-registry-note.mdx
+++ b/macros/serverless/container-registry-note.mdx
@@ -2,5 +2,5 @@
 macro: container-registry-note
 ---
 
-[Scaleway's Container Registry](/container-registry/) allows for a seamless integration with Serverless Containers and Jobs at a [competitive price](/container-registry/faq//#how-am-i-billed-for-scaleway-container-registry). 
+[Scaleway's Container Registry](/container-registry/) allows for a seamless integration with Serverless Containers and Jobs at a [competitive price](/container-registry/faq/#how-am-i-billed-for-scaleway-container-registry). 
 Serverless products support external public registries (such as [Docker Hub](https://hub.docker.com/search?q=)), but we do not recommend using them due to uncontrolled rate limiting, which can lead to failures when starting resources, unexpected usage conditions, and pricing changes.
diff --git a/pages/billing/troubleshooting/index.mdx b/pages/billing/troubleshooting/index.mdx
index 062c9555ef..c779aa7662 100644
--- a/pages/billing/troubleshooting/index.mdx
+++ b/pages/billing/troubleshooting/index.mdx
@@ -22,7 +22,7 @@ categories:
     <DefaultCard
       title="Billing FAQ"
       description="General info on Scaleway billing."
-      url="/faq/billing/"
+      url="/billing/faq"
       label="See more"
     />
     <DefaultCard
diff --git a/pages/block-storage/troubleshooting/index.mdx b/pages/block-storage/troubleshooting/index.mdx
index 852e6e201f..a094b3a92a 100644
--- a/pages/block-storage/troubleshooting/index.mdx
+++ b/pages/block-storage/troubleshooting/index.mdx
@@ -20,7 +20,7 @@ categories:
     <DefaultCard 
       title="Block Storage FAQ"
       description="General info on Block Storage."
-      url="/faq/block-storage/"
+      url="/block-storage/faq"
       label="See more"
     />
     <DefaultCard 
diff --git a/pages/edge-services/troubleshooting/index.mdx b/pages/edge-services/troubleshooting/index.mdx
index eef10303e4..e0462788da 100644
--- a/pages/edge-services/troubleshooting/index.mdx
+++ b/pages/edge-services/troubleshooting/index.mdx
@@ -24,7 +24,7 @@ categories:
     <DefaultCard
       title="Edge Services FAQ"
       description="Answers to common questions"
-      url="/faq/edge-services/"
+      url="/edge-services/faq"
       label="See more"
     />
     <DefaultCard
diff --git a/pages/iam/troubleshooting/index.mdx b/pages/iam/troubleshooting/index.mdx
index 2dcf4385d7..41da1c0e07 100644
--- a/pages/iam/troubleshooting/index.mdx
+++ b/pages/iam/troubleshooting/index.mdx
@@ -22,7 +22,7 @@ categories:
     <DefaultCard
       title="IAM FAQ"
       description="General info on Scaleway IAM."
-      url="/faq/iam/"
+      url="/iam/faq"
       label="See more"
     />
     <DefaultCard
diff --git a/pages/load-balancer/troubleshooting/index.mdx b/pages/load-balancer/troubleshooting/index.mdx
index 9ad9c65b08..0c59b749cd 100644
--- a/pages/load-balancer/troubleshooting/index.mdx
+++ b/pages/load-balancer/troubleshooting/index.mdx
@@ -24,7 +24,7 @@ categories:
     <DefaultCard
       title="Load Balancer FAQ"
       description="Answers to common questions"
-      url="/faq/loadbalancer/"
+      url="/load-balancer/faq/"
       label="See more"
     />
     <DefaultCard
diff --git a/pages/managed-databases-for-postgresql-and-mysql/troubleshooting/index.mdx b/pages/managed-databases-for-postgresql-and-mysql/troubleshooting/index.mdx
index 33c494b089..f8b81dc602 100644
--- a/pages/managed-databases-for-postgresql-and-mysql/troubleshooting/index.mdx
+++ b/pages/managed-databases-for-postgresql-and-mysql/troubleshooting/index.mdx
@@ -22,7 +22,7 @@ categories:
     <DefaultCard
       title="Managed Databases for PostgreSQL and MySQL FAQ"
       description="General info on Managed Databases"
-      url="/faq/databases-for-postgresql-and-mysql/"
+      url="/managed-databases-for-postgresql-and-mysql/faq/"
       label="See more"
     />
     <DefaultCard
diff --git a/pages/object-storage/troubleshooting/index.mdx b/pages/object-storage/troubleshooting/index.mdx
index 3c06dc9b49..17f67ef487 100644
--- a/pages/object-storage/troubleshooting/index.mdx
+++ b/pages/object-storage/troubleshooting/index.mdx
@@ -23,7 +23,7 @@ categories:
     <DefaultCard 
       title="Object Storage FAQ"
       description="General information on Object Storage"
-      url="/faq/object-storage/"
+      url="/object-storage/faq"
       label="See more"
     />
     <DefaultCard 
diff --git a/pages/serverless-containers/troubleshooting/index.mdx b/pages/serverless-containers/troubleshooting/index.mdx
index afd698a823..9f1d06a04f 100644
--- a/pages/serverless-containers/troubleshooting/index.mdx
+++ b/pages/serverless-containers/troubleshooting/index.mdx
@@ -24,7 +24,7 @@ categories:
     <DefaultCard 
       title="Serverless Containers FAQ"
       description="General info on Serverless Containers"
-      url="/faq/serverless-containers/"
+      url="/serverless-containers/faq"
       label="See more"
     />
     <DefaultCard 
diff --git a/pages/serverless-functions/troubleshooting/index.mdx b/pages/serverless-functions/troubleshooting/index.mdx
index 787f6824d0..9f82c9e9d4 100644
--- a/pages/serverless-functions/troubleshooting/index.mdx
+++ b/pages/serverless-functions/troubleshooting/index.mdx
@@ -24,7 +24,7 @@ categories:
     <DefaultCard 
       title="Serverless Functions FAQ"
       description="General info on Serverless Functions."
-      url="/faq/serverless-functions/"
+      url="/serverless-functions/faq"
       label="See more"
     />
     <DefaultCard 
diff --git a/pages/serverless-jobs/troubleshooting/index.mdx b/pages/serverless-jobs/troubleshooting/index.mdx
index bc2defd21b..9982e5f214 100644
--- a/pages/serverless-jobs/troubleshooting/index.mdx
+++ b/pages/serverless-jobs/troubleshooting/index.mdx
@@ -24,7 +24,7 @@ categories:
     <DefaultCard 
       title="Serverless Jobs FAQ"
       description="General info on Serverless Jobs"
-      url="/faq/serverless-jobs/"
+      url="/serverless-jobs/faq"
       label="See more"
     />
     <DefaultCard 
diff --git a/pages/transactional-email/troubleshooting/index.mdx b/pages/transactional-email/troubleshooting/index.mdx
index 0025b489b5..cd119d3eaf 100644
--- a/pages/transactional-email/troubleshooting/index.mdx
+++ b/pages/transactional-email/troubleshooting/index.mdx
@@ -22,7 +22,7 @@ categories:
     <DefaultCard
       title="Transactional Email FAQ"
       description="General info on Transactional Email"
-      url="/faq/transactional-email/"
+      url="/transactional-email/faq"
       label="See more"
     />
     <DefaultCard
diff --git a/tutorials/discourse-forum/index.mdx b/tutorials/discourse-forum/index.mdx
index 68be18caca..c1f00b90ea 100644
--- a/tutorials/discourse-forum/index.mdx
+++ b/tutorials/discourse-forum/index.mdx
@@ -29,7 +29,7 @@ For those looking to set up Discourse, using the official [Docker image](https:/
 - An [SSH key](/organizations-and-projects/how-to/create-ssh-key/)
 - An [Instance](/instances/how-to/create-an-instance/) running on Ubuntu Focal Fossa (20.04)
 - A domain name pointed to your Instance
-- Enabled the [SMTP ports](https://www.scaleway.com/en/faq/why-can-i-not-send-any-email/)
+- Enabled the [SMTP ports](/instances/how-to/send-emails-from-your-instance/)
 - Configured a [mail server](/tutorials/setup-postfix-ubuntu-bionic/) or have an SMTP account available
 
 ## Installing Discourse