diff --git a/website/src/app/kb/client-apps/readme.mdx b/website/src/app/kb/client-apps/readme.mdx
index e58d5cc04..c76d5b698 100644
--- a/website/src/app/kb/client-apps/readme.mdx
+++ b/website/src/app/kb/client-apps/readme.mdx
@@ -60,4 +60,11 @@ platform.
   >
     <p>Linux Headless</p>
   </LinuxIcon>
+  <WindowsIcon
+    className="text-neutral-800 hover:text-neutral-900"
+    size={10}
+    href="/kb/client-apps/windows-headless-client"
+  >
+    <p>Windows Headless</p>
+  </WindowsIcon>
 </div>
diff --git a/website/src/app/kb/deploy/clients/readme.mdx b/website/src/app/kb/deploy/clients/readme.mdx
index 1324fd25c..95f476eb8 100644
--- a/website/src/app/kb/deploy/clients/readme.mdx
+++ b/website/src/app/kb/deploy/clients/readme.mdx
@@ -67,9 +67,9 @@ See the table below for achieving headless mode operation on each platform:
 | Platform           | Headless Mode Operation                                                                                                                                                                                                                                                               |
 | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | Android / ChromeOS | Set the `token` key using an MDM provider that supports Android [managed configurations](https://developer.android.com/work/managed-configurations). If the token is set and valid, Firezone will automatically connect and authenticate using this token when the Client is started. |
-| Linux              | Set the `FIREZONE_TOKEN` and `FIREZONE_ID` environment variables when running the Client binary.                                                                                                                                                                                      |
+| Linux              | See the [Linux Headless Client](/kb/client-apps/linux-headless-client) guide.                                                                                                                                                                                                         |
 | macOS / iOS        | Not yet supported.                                                                                                                                                                                                                                                                    |
-| Windows            | Not yet supported.                                                                                                                                                                                                                                                                    |
+| Windows            | See the [Windows Headless Client](/kb/client-apps/windows-headless-client) guide.                                                                                                                                                                                                     |
 
 <NextStep href="/kb/deploy/dns">Next: Configure DNS</NextStep>