diff --git a/elixir/apps/web/lib/web/components/navigation_components.ex b/elixir/apps/web/lib/web/components/navigation_components.ex
index bf2e9490f..63e631b33 100644
--- a/elixir/apps/web/lib/web/components/navigation_components.ex
+++ b/elixir/apps/web/lib/web/components/navigation_components.ex
@@ -337,7 +337,7 @@ defmodule Web.NavigationComponents do
   def website_link(assigns) do
     ~H"""
     <.link
-      navigate={"https://www.firezone.dev#{@href}?utm_source=product"}
+      navigate={"https://www.firezone.dev?utm_source=product#{@href}"}
       class={link_style()}
       target="_blank"
       {@rest}
diff --git a/elixir/apps/web/lib/web/live/sites/new_token.ex b/elixir/apps/web/lib/web/live/sites/new_token.ex
index 092f1e3d1..244295aa9 100644
--- a/elixir/apps/web/lib/web/live/sites/new_token.ex
+++ b/elixir/apps/web/lib/web/live/sites/new_token.ex
@@ -57,7 +57,7 @@ defmodule Web.Sites.NewToken do
         Gateways require egress connectivity to the control plane API and relay servers.
         <strong>No ingress firewall rules</strong>
         are required or recommended. See our
-        <.website_link href="/kb/deploy/gateways#firewall-considerations">
+        <.website_link href="/kb/deploy/gateways#firewall-ports">
           deploy guide
         </.website_link>
         for more information.
@@ -149,18 +149,6 @@ defmodule Web.Sites.NewToken do
                 phx-update="ignore"
               ><%= manual_command(@env) %></.code_block>
 
-              <p class="p-4">
-                See
-                <.link
-                  href="https://www.firezone.dev/kb/deploy/gateways#environment_variables"
-                  target="_blank"
-                  class={link_style()}
-                >
-                  the Gateway docs
-                </.link>
-                for a full list of environment variables.
-              </p>
-
               <p class="p-4">
                 <strong>Important:</strong>
                 You'll need to make sure that the <code>iptables</code>
diff --git a/website/src/app/kb/deploy/gateways/readme.mdx b/website/src/app/kb/deploy/gateways/readme.mdx
index 42bce4bdc..ca72b5891 100644
--- a/website/src/app/kb/deploy/gateways/readme.mdx
+++ b/website/src/app/kb/deploy/gateways/readme.mdx
@@ -21,6 +21,8 @@ responsible for securely routing traffic between Clients and Resources.
 - [Docker Engine](https://docs.docker.com/engine/) or
   [systemd](https://systemd.io/) installed for your distribution
 
+{/* The header `firewall-ports` is referenced in code */}
+
 ### Firewall ports
 
 Gateways implement the industry-standard
@@ -115,8 +117,7 @@ Site.
 <Alert color="warning">
   **Note:** Be sure to set a unique `FIREZONE_ID` for each Gateway you deploy.
   This can be any non-empty string and is used to identify Gateways in the
-  portal. This is generated automatically for you when deploying Gateways from
-  the portal.
+  portal.
 </Alert>
 
 Deploy as many Gateways as you need to handle the load of Client connections to