diff --git a/website/src/app/kb/reference/faq/readme.mdx b/website/src/app/kb/reference/faq/readme.mdx
index 81bfb888a..3892ee20f 100644
--- a/website/src/app/kb/reference/faq/readme.mdx
+++ b/website/src/app/kb/reference/faq/readme.mdx
@@ -49,8 +49,8 @@ stack, it supports all application protocols without modification.
#### How long does it take to set up Firezone?
Firezone can be set up in less than 10 minutes, and Gateways can be added by
-running a simple Docker command. Visit our docs for more information and step by
-step instructions.
+running a simple Docker command. Check out the [Quickstart Guide](/kb/quickstart)
+for step-by-step instructions.
#### Do I have to be technical to run Firezone?
@@ -79,12 +79,14 @@ Firezone uses a split control plane and data plane architecture to allow for
things like key distribution, user authentication, and policy enforcement to
happen out-of-band with the hot data paths. The data plane components such as
the Clients and Gateway are specifically designed to be self-hosted, but the
-control plane, due to its complexity, security, and persistence requirements, is
+control plane, due to its reliability, security, and persistence requirements, is
not.
That said, Firezone's product is 100% open source and can be found at our
[main repository](https://github.com/firezone/firezone). Our license does not
-prevent self-hosters from using the product as they see fit.
+prevent you from self-hosting Firezone without limits for your organization, but
+Firezone provides no support or documentation for self-hosted deployments, and
+in general we only recommend it for hobby or educational purposes at this time.
#### How do I get Firezone on an end-user device?
diff --git a/website/src/app/pricing/_page.tsx b/website/src/app/pricing/_page.tsx
index e6ae8d763..b33119cb7 100644
--- a/website/src/app/pricing/_page.tsx
+++ b/website/src/app/pricing/_page.tsx
@@ -6,6 +6,7 @@ import { HiCheck } from "react-icons/hi2";
import Link from "next/link";
import PlanTable from "./plan_table";
import { useState } from "react";
+import { Accordion } from "flowbite-react";
export default function _Page() {
let [annual, setAnnual] = useState(true);
@@ -285,168 +286,187 @@ export default function _Page() {
FAQ
-
-
-
+
+
+
+ How long does it take to set up Firezone?
+
+
+ A simple deployment takes{" "}
- How long does it take to set up Firezone?
+ less than 10 minutes{" "}
-
-
+ and can be accomplished with by installing the{" "}
- Do I need to rip and replace my current VPN to use Firezone?
-
-
-
-
- What happens to my data with Firezone enabled?
-
-
-
+ Firezone Client
+ {" "}
+ and{" "}
- How do I cancel or change my plan?
+ deploying one or more Gateways
-
-
+ .{" "}
+
+ Visit our docs
+ {" "}
+ for more information and step by step instructions.
+
+
+
+ Is there a self-hosted plan?
+
+ All of the source code for the entire Firezone product is
+ available at our{" "}
- When will I be billed?
+ GitHub repository
-
-
+ , and you're free to self-host Firezone for your organization
+ without restriction. However, we don't offer documentation or
+ support for self-hosting Firezone at this time.
+
+
+
+
+ Do I need to rip and replace my current VPN to use Firezone?
+
+
+ No. As long they're set up to access different resources, you
+ can run Firezone alongside your existing remote access
+ solutions, and switch over whenever you’re ready. There’s no
+ need for any downtime or unnecessary disruptions.
+
+
+
+
+ Can I try Firezone before I buy it?
+
+
+ Yes. The Starter plan is free to use without limitation. No
+ credit card is required to get started. The Enterprise plan
+ includes a free pilot period to evaluate whether Firezone is a
+ good fit for your organization.{" "}
- What payment methods are available?
-
-
-
+ Contact sales
+ {" "}
+ to request a demo.
+
+
+
+
+ My seat counts have changed. Can I adjust my plan?
+
+
+
Yes.
+
+ For the Team plan, you can add or remove
+ seats at any time. When adding seats, you'll be charged a
+ prorated amount for the remainder of the billing cycle. When
+ removing seats, the change will take effect at the end of the
+ billing cycle.
+
+
+ For the Enterprise plan, we will periodically
+ check your active seat count and will contact you to true up
+ your account once a quarter if there is a substantial change.
+ Enterprise plans{" "}
+
+ will never become automatically locked or disabled due to an
+ increase in usage
+
+ .
+
+
+
+
+
+ What happens to my data with Firezone enabled?
+
+
+ Network traffic is always end-to-end encrypted, and by default,
+ routes directly to Gateways running on your infrastructure. In
+ rare circumstances, encrypted traffic can pass through our
+ global relay network if a direct connection cannot be
+ established. Firezone can never decrypt the contents of your
+ traffic.
+
+
+
+
+ How do I cancel or change my plan?
+
+
+ For Starter and Team plans, you can downgrade by going to your
+ Account settings in your Firezone admin portal. For Enterprise
+ plans, contact your account manager for subscription updates. If
+ you'd like to completely delete your account,{" "}
- Do you offer special pricing for nonprofits and educational
- institutions?
+ contact support
-
-
+ .
+
+
+
+ When will I be billed?
+
+ The Team plan is billed monthly on the same day you start
+ service until canceled. Enterprise plans are billed annually.
+
+
+
+
+ What payment methods are available?
+
+
+ The Starter plan is free and does not require a credit card to
+ get started. Team and Enterprise plans can be paid via credit
+ card, ACH, or wire transfer.
+
+
+
+
+ Do you offer special pricing for nonprofits and educational
+ institutions?
+
+
+ Yes. Not-for-profit organizations and educational institutions
+ are eligible for a 50% discount.{" "}
- Other than using Firezone, is there anything I can do to
- improve my cybersecurity?
-
-
-
-
-
-
-
-
How long does it take to set up Firezone?
-
-
- Firezone can be set up in{" "}
-
- less than 10 minutes
-
- , and Gateways can be added by running a simple Docker command.{" "}
-
- Visit our docs
- {" "}
- for more information and step by step instructions.
-
-
-
-
-
Do I need to rip and replace my current VPN with Firezone?
-
-
- No. As long they're set up to access different resources, you can
- run Firezone alongside your existing remote access solutions, and
- switch over whenever you’re ready. There’s no need for any downtime
- or unnecessary disruptions.
-
-
-
-
-
What happens to my data with Firezone enabled?
-
-
- Network traffic is always end-to-end encrypted, and by default,
- routes directly to Gateways running on your infrastructure. In rare
- circumstances, encrypted traffic can pass through our global relay
- network if a direct connection cannot be established. Firezone can
- never decrypt the contents of your traffic.
-
-
-
-
-
How do I cancel or change my plan?
-
-
- Please{" "}
-
- contact support
- {" "}
- if you would like to change your plan or terminate your account.
-
-
-
-
-
When will I be billed?
-
-
- The Team plan is billed monthly on the same day you start service
- until canceled. Enterprise plans are billed annually.
-
-
-
-
-
What payment methods are available?
-
-
- The Starter plan is free and does not require a credit card to get
- started. Team and Enterprise plans can be paid via credit card, ACH,
- or wire transfer.
-
-
-
-
-
- Do you offer special pricing for nonprofits and educational
- institutions?
-
-
-
- Yes. Not-for-profit organizations and educational institutions are
- eligible for a 50% discount.{" "}
-
- Contact sales
- {" "}
- to request the discount.
-
+ Contact sales
+ {" "}
+ to request the discount.
+
+
+
+
+ What payment methods are available?
+
+
+ The Starter plan is free and does not require a credit card to
+ get started. Team and Enterprise plans can be paid via credit
+ card, ACH, or wire transfer.
+
+
+