diff --git a/README.md b/README.md
index a8e4755a0..0738ab2fd 100644
--- a/README.md
+++ b/README.md
@@ -35,10 +35,10 @@
 
 **Note**: 🚧 The `main` branch is undergoing major restructuring in preparation
 
-for the release of Firezone 1.x 🚧.
+for the release of Firezone 1.0 🚧.
 
-See the [`legacy` branch](https://github.com/firezone/firezone/tree/legacy) to
-track the latest changes to Firezone 0.7.
+See the [`legacy` branch](https://github.com/firezone/firezone/tree/legacy) if
+you're looking for Firezone 0.7.
 
 [Read the 1.0 announcement for more](https://www.firezone.dev/blog/firezone-1-0).
 
@@ -153,13 +153,13 @@ setup and manage than 0.x and so you probably don't need to.
 ### How long will 0.7 be supported until?
 
 **Firezone 0.7 is currently end-of-life and will stop receiving updates after
-January 31st, 2024.**
+January 31st, 2024.** It will continue to be available indefinitely from the
+`legacy` branch of this repo under the Apache 2.0 license.
 
-<!-- TODO
-> What's your pricing structure like?
+### What's your pricing structure like?
 
-Please see our pricing page at https://www.firezone.dev/pricing?utm_source=readme
--->
+Please see our pricing page at
+https://www.firezone.dev/pricing?utm_source=readme
 
 ## Documentation
 
diff --git a/website/src/app/page.tsx b/website/src/app/page.tsx
index 00e8bbe3c..96f2ec5c4 100644
--- a/website/src/app/page.tsx
+++ b/website/src/app/page.tsx
@@ -91,7 +91,7 @@ export default function Page() {
                   Create a{" "}
                   <Link
                     className="text-accent-500 underline hover:no-underline"
-                    href="/kb/learn/concepts/site?utm_source=website"
+                    href="/kb/deploy/sites?utm_source=website"
                   >
                     site
                   </Link>
@@ -103,7 +103,7 @@ export default function Page() {
                   Deploy one or more{" "}
                   <Link
                     className="text-accent-500 underline hover:no-underline"
-                    href="/kb/learn/concepts/gateway?utm_source=website"
+                    href="/kb/deploy/gateways?utm_source=website"
                   >
                     gateways
                   </Link>
@@ -115,7 +115,7 @@ export default function Page() {
                   Add a{" "}
                   <Link
                     className="text-accent-500 underline hover:no-underline"
-                    href="/kb/learn/concepts/resource?utm_source=website"
+                    href="/kb/deploy/resources?utm_source=website"
                   >
                     resource
                   </Link>{" "}
@@ -128,7 +128,7 @@ export default function Page() {
                   Choose which{" "}
                   <Link
                     className="text-accent-500 underline hover:no-underline"
-                    href="/kb/learn/concepts/group?utm_source=website"
+                    href="/kb/authenticate?utm_source=website"
                   >
                     user groups
                   </Link>{" "}