diff --git a/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/client-errors.mdx b/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/client-errors.mdx
index d980341da661434..e5b41424d3333f4 100644
--- a/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/client-errors.mdx
+++ b/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/client-errors.mdx
@@ -6,10 +6,12 @@ sidebar:
---
-import { Details } from "~/components"
+import { Details, Render } from "~/components"
This page lists the error codes that can appear in the WARP client GUI. If you do not see your error below, refer to [common issues](/cloudflare-one/team-and-resources/devices/warp/troubleshooting/common-issues/) or [contact Cloudflare Support](/support/contacting-cloudflare-support/).
+
+

diff --git a/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/common-issues.mdx b/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/common-issues.mdx
index 70742c3130fd458..f0b69561af85b3c 100644
--- a/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/common-issues.mdx
+++ b/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/common-issues.mdx
@@ -9,6 +9,8 @@ import { Render } from "~/components";
This section covers the most common issues you might encounter as you deploy the WARP client in your organization, or turn on new features that interact with the client. If you do not see your issue listed below, refer to the [troubleshooting FAQ](/cloudflare-one/faq/troubleshooting/) or [contact Cloudflare Support](/support/contacting-cloudflare-support/).
+
+
## Unable to connect WARP
If WARP is stuck in the `Disconnected` state or frequently changes between `Connected` and `Disconnected`, this indicates that the client cannot establish a connection to Cloudflare's global network.
diff --git a/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/known-limitations.mdx b/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/known-limitations.mdx
index b69a4809262d2b4..4e442377a3418ce 100644
--- a/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/known-limitations.mdx
+++ b/src/content/docs/cloudflare-one/team-and-resources/devices/warp/troubleshooting/known-limitations.mdx
@@ -8,8 +8,12 @@ head:
content: Known limitations - WARP
---
+import { Render } from "~/components";
+
Below, you will find information on devices, software, and configurations that are incompatible with Cloudflare WARP.
+
+
## Windows Server
The WARP client does not run on Windows Server. Refer to the [downloads page](/cloudflare-one/team-and-resources/devices/warp/download-warp/) for a list of supported operating systems.
diff --git a/src/content/docs/learning-paths/replace-vpn/connect-devices/validate-traffic-in-gateway.mdx b/src/content/docs/learning-paths/replace-vpn/connect-devices/validate-traffic-in-gateway.mdx
index ac6433a9d370fbb..6be353d5b3447eb 100644
--- a/src/content/docs/learning-paths/replace-vpn/connect-devices/validate-traffic-in-gateway.mdx
+++ b/src/content/docs/learning-paths/replace-vpn/connect-devices/validate-traffic-in-gateway.mdx
@@ -15,3 +15,5 @@ import { Render } from "~/components";
## Best practices
Securing your organization with a Zero Trust Network Access solution usually happens in two phases: the first phase is establishing connectivity, and the second phase is building policies for distinct applications. We recommend verifying that all connectivity is working as expected before moving on to build complex security policies. This will reduce the amount of troubleshooting and challenges that arise from managing complex systems.
+
+
diff --git a/src/content/docs/learning-paths/replace-vpn/troubleshooting/index.mdx b/src/content/docs/learning-paths/replace-vpn/troubleshooting/index.mdx
index bacab9fcb3be377..79b79f8e632eeac 100644
--- a/src/content/docs/learning-paths/replace-vpn/troubleshooting/index.mdx
+++ b/src/content/docs/learning-paths/replace-vpn/troubleshooting/index.mdx
@@ -6,6 +6,8 @@ sidebar:
---
+import { Render } from "~/components";
+
Learn how to troubleshoot your ZTNA deployment.
## Objectives
@@ -14,3 +16,5 @@ By the end of this module, you will be able to:
* Investigate why users cannot connect to private network applications behind Cloudflare Tunnel.
* Fix the most common causes of connectivity issues.
+
+
diff --git a/src/content/docs/learning-paths/secure-internet-traffic/configure-device-agent/index.mdx b/src/content/docs/learning-paths/secure-internet-traffic/configure-device-agent/index.mdx
index 3d61feb51e886fa..e9e4019bb53f247 100644
--- a/src/content/docs/learning-paths/secure-internet-traffic/configure-device-agent/index.mdx
+++ b/src/content/docs/learning-paths/secure-internet-traffic/configure-device-agent/index.mdx
@@ -26,3 +26,5 @@ By the end of this module, you will be able to:
file="zero-trust/configure-device-agent-objectives"
product="learning-paths"
/>
+
+
diff --git a/src/content/docs/learning-paths/secure-internet-traffic/connect-devices-networks/validate-traffic-in-gateway.mdx b/src/content/docs/learning-paths/secure-internet-traffic/connect-devices-networks/validate-traffic-in-gateway.mdx
index aba55abc1a883d4..3ed0cb267d84dd1 100644
--- a/src/content/docs/learning-paths/secure-internet-traffic/connect-devices-networks/validate-traffic-in-gateway.mdx
+++ b/src/content/docs/learning-paths/secure-internet-traffic/connect-devices-networks/validate-traffic-in-gateway.mdx
@@ -15,3 +15,5 @@ import { Render } from "~/components";
## Best practices
Securing your organization with Zero Trust usually happens in two phases: the first phase is establishing connectivity, and the second phase is building policies for distinct applications. We recommend verifying that all connectivity is working as expected before moving on to build complex security policies. This will reduce the amount of troubleshooting and challenges that arise from managing complex systems.
+
+
diff --git a/src/content/partials/cloudflare-one/warp/troubleshooting-guide-reference.mdx b/src/content/partials/cloudflare-one/warp/troubleshooting-guide-reference.mdx
new file mode 100644
index 000000000000000..7c7864c6e30dc8b
--- /dev/null
+++ b/src/content/partials/cloudflare-one/warp/troubleshooting-guide-reference.mdx
@@ -0,0 +1,10 @@
+:::note[Troubleshoot WARP]
+
+For step-by-step guidance on diagnosing and resolving WARP client issues, refer to the [WARP troubleshooting guide](/cloudflare-one/team-and-resources/devices/warp/troubleshooting/troubleshooting-guide/). The guide covers:
+
+- How to collect diagnostic logs via the Cloudflare dashboard or CLI
+- How to review key configuration files
+- Common misconfigurations and their fixes
+- Best practices for filing support tickets
+
+:::