diff --git a/public/__redirects b/public/__redirects
index c8db578b55029a4..1f33479d21853cb 100644
--- a/public/__redirects
+++ b/public/__redirects
@@ -1603,6 +1603,7 @@
/turnstile/get-started/terraform/ /turnstile/get-started/widget-management/terraform/ 301
/turnstile/glossary/ /turnstile/ 301
/turnstile/get-started/supported-browsers/ /cloudflare-challenges/reference/supported-browsers/ 301
+/turnstile/troubleshooting/troubleshooting-faqs/ /turnstile/frequently-asked-questions/#troubleshooting 301
# waf
/waf/about/ /waf/concepts/ 301
diff --git a/src/content/docs/turnstile/frequently-asked-questions.mdx b/src/content/docs/turnstile/frequently-asked-questions.mdx
index b480878b62e5dbf..23c184a93bfbddb 100644
--- a/src/content/docs/turnstile/frequently-asked-questions.mdx
+++ b/src/content/docs/turnstile/frequently-asked-questions.mdx
@@ -7,36 +7,74 @@ sidebar:
---
-## What features are available for Free or Enterprise users?
+import { Render } from "~/components"
+
+## General
+
+### What features are available for Free or Enterprise users?
Refer to [Availability](/turnstile/#availability) for more information on features available per tier.
---
-## What languages does Turnstile support?
+### What languages does Turnstile support?
Refer to the [list of supported languages](/turnstile/reference/supported-languages/) for more information.
---
-## Does Turnstile conform to WCAG 2.1 Level AA accessibility standard?
+### Does Turnstile conform to WCAG 2.1 Level AA accessibility standard?
Yes, Turnstile is WCAG 2.1 Level AA compliant.
---
-## Where can I get additional support for Turnstile?
+### Where can I get additional support for Turnstile?
Refer to the [Cloudflare Community](https://community.cloudflare.com/c/website-application-performance/turnstile/83) or join the [Cloudflare Developers Discord server](https://discord.com/channels/595317990191398933/1025131875397812224).
---
-## Can I use Turnstile in websites not proxied by Cloudflare?
+### Can I use Turnstile in websites not proxied by Cloudflare?
Turnstile can be embedded into any website without sending traffic through Cloudflare and works without showing visitors a CAPTCHA.
---
-## What is Turnstile's data privacy policy?
+### What is Turnstile's data privacy policy?
+
+For information on Turnstile's data privacy policy, refer to the [Turnstile Privacy Addendum](https://www.cloudflare.com/turnstile-privacy-policy/).
+
+---
+
+## Troubleshooting
+
+### What happens if the user takes longer than five minutes?
+
+The Turnstile widget needs to be refreshed to generate a new token. This can be done using the `turnstile.reset` function.
+
+### Can the front end use Siteverify?
+
+The Siteverify API must not be called by the front end as this may reveal the secret key used to authenticate. An attacker may simply modify the front end to not perform the siteverify check at all, rendering Turnstile ineffective.
+
+### What is challenges.cloudflare.com, and why does my application connect to this origin?
+
+Turnstile is hosted under `challenges.cloudflare.com`.
+
+### I am seeing a 401 error in your console during a Turnstile security check, is this a problem?
+
+You can safely ignore the error. It is requesting a [Private Access Token (PAT)](/cloudflare-challenges/reference/private-access-tokens/) that your device or browser does not support yet.
+
+### How can I obtain the Ray ID or QR code for troubleshooting?
+
+You will need to provide a [Ray ID](/fundamentals/reference/cloudflare-ray-id/) or QR code when debugging issues. The Ray ID is found at the end of the challenge page. You can obtain the QR code by clicking the success/failure/spinner logo on the widget four times.
+
+### Can I use Turnstile on URI schemes such as `file://`?
+
+No, Turnstile only works on `http://` and `https://` URI schemes. Other protocols such as `file://` are not supported.
+
+### Why do I see a challenge on my proxied hostnames?
+
+
-For information on Turnstile's data privacy policy, refer to the [Turnstile Privacy Addendum](https://www.cloudflare.com/turnstile-privacy-policy/).
\ No newline at end of file
+
diff --git a/src/content/docs/turnstile/troubleshooting/challenge-solve-issues.mdx b/src/content/docs/turnstile/troubleshooting/challenge-solve-issues.mdx
new file mode 100644
index 000000000000000..dc19ab67761b1f2
--- /dev/null
+++ b/src/content/docs/turnstile/troubleshooting/challenge-solve-issues.mdx
@@ -0,0 +1,8 @@
+---
+pcx_content_type: troubleshooting
+title: Challenge solve issues
+external_link: /cloudflare-challenges/troubleshooting/challenge-solve-issues/
+sidebar:
+ order: 4
+
+---
diff --git a/src/content/docs/turnstile/troubleshooting/feedback-reports.mdx b/src/content/docs/turnstile/troubleshooting/feedback-reports.mdx
index 687f446186f5008..91dc034a2aaf33a 100644
--- a/src/content/docs/turnstile/troubleshooting/feedback-reports.mdx
+++ b/src/content/docs/turnstile/troubleshooting/feedback-reports.mdx
@@ -2,7 +2,7 @@
title: Feedback reports
pcx_content_type: troubleshooting
sidebar:
- order: 4
+ order: 5
---
diff --git a/src/content/docs/turnstile/troubleshooting/troubleshooting-faqs.mdx b/src/content/docs/turnstile/troubleshooting/troubleshooting-faqs.mdx
deleted file mode 100644
index e353a3a44e6938a..000000000000000
--- a/src/content/docs/turnstile/troubleshooting/troubleshooting-faqs.mdx
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: Troubleshooting FAQ
-pcx_content_type: faq
-sidebar:
- order: 5
----
-
-import { Render } from "~/components";
-
-## What happens if the user takes longer than five minutes?
-
-The Turnstile widget needs to be refreshed to generate a new token. This can be done using the `turnstile.reset` function.
-
-## Can the front end use Siteverify?
-
-The Siteverify API must not be called by the front end as this may reveal the secret key used to authenticate. An attacker may simply modify the front end to not perform the siteverify check at all, rendering Turnstile ineffective.
-
-## What is challenges.cloudflare.com, and why does my application connect to this origin?
-
-Turnstile is hosted under `challenges.cloudflare.com`.
-
-## I am seeing a 401 error in your console during a Turnstile security check, is this a problem?
-
-You can safely ignore the error. It is requesting a [Private Access Token (PAT)](/cloudflare-challenges/reference/private-access-tokens/) that your device or browser does not support yet.
-
-## How can I obtain the Ray ID or QR code for troubleshooting?
-
-You will need to provide a [Ray ID](/fundamentals/reference/cloudflare-ray-id/) or QR code when debugging issues. The Ray ID is found at the end of the challenge page. You can obtain the QR code by clicking the success/failure/spinner logo on the widget four times.
-
-## Can I use Turnstile on URI schemes such as `file://`?
-
-No, Turnstile only works on `http://` and `https://` URI schemes. Other protocols such as `file://` are not supported.
-
-## Why do I see a challenge on my proxied hostnames?
-
-
-
-