diff --git a/docs/pages/access-controls/getting-started.mdx b/docs/pages/access-controls/getting-started.mdx
index 1b3ecb7b07dfd..d88285308cfda 100644
--- a/docs/pages/access-controls/getting-started.mdx
+++ b/docs/pages/access-controls/getting-started.mdx
@@ -6,7 +6,7 @@ description: Get started using Teleport Access Controls.
 # Getting Started
 
 In Teleport, any local, SSO, or robot user can be a member of one or several
-roles. Roles govern access to databases, SSH servers, kubernetes clusters, and web apps.
+roles. Roles govern access to databases, SSH servers, Kubernetes clusters, Windows desktops and web apps.
 
 We will start with local users and preset roles, map SSO users to roles and wrap up
 with creating your own role.
@@ -14,7 +14,7 @@ with creating your own role.
 ## Prerequisites
 
 - Installed [Teleport](../getting-started.mdx) or [Teleport Cloud](../cloud/introduction.mdx) >= (=teleport.version=)
-- [Tctl admin tool](https://goteleport.com/teleport/download) >= (=teleport.version=)
+- [tctl admin tool](https://goteleport.com/teleport/download) >= (=teleport.version=)
 
 (!docs/pages/includes/permission-warning.mdx!)
 
diff --git a/docs/pages/enterprise/fedramp.mdx b/docs/pages/enterprise/fedramp.mdx
index 60ab5963dd50d..d3057d584b04c 100644
--- a/docs/pages/enterprise/fedramp.mdx
+++ b/docs/pages/enterprise/fedramp.mdx
@@ -1,7 +1,7 @@
 ---
-title: FedRAMP compliance for SSH, Kubernetes and Applications
-description: How to configure SSH, Kubernetes and Application access to be FedRAMP compliant, including support for FIPS 140-2
-h1: FedRAMP for SSH and Kubernetes and Application Access
+title: FedRAMP compliance for Infrastructure access 
+description: How to configure SSH, Kubernetes, database, and web app access to be FedRAMP compliant, including support for FIPS 140-2
+h1: FedRAMP for SSH, Kubernetes, Databases and Web Apps.
 ---
 
 Teleport provides the foundation to meet FedRAMP requirements for the purposes of accessing infrastructure. This includes support for [FIPS 140-2](https://en.wikipedia.org/wiki/FIPS\_140-2), also known as the Federal Information Processing Standard, which is the US government approved standard for cryptographic modules. This document outlines a high
diff --git a/docs/pages/enterprise/getting-started.mdx b/docs/pages/enterprise/getting-started.mdx
index dd909cfbbdb39..95e0cdb135143 100644
--- a/docs/pages/enterprise/getting-started.mdx
+++ b/docs/pages/enterprise/getting-started.mdx
@@ -1,6 +1,6 @@
 ---
 title: Teleport Enterprise Quick Start
-description: How to set up and configure Teleport Enterprise for SSH and Kubernetes access
+description: How to set up and configure Teleport Enterprise for SSH
 h1: Teleport Enterprise Quick Start
 ---
 
diff --git a/docs/pages/enterprise/soc2.mdx b/docs/pages/enterprise/soc2.mdx
index b56eb1780783c..55604d6879909 100644
--- a/docs/pages/enterprise/soc2.mdx
+++ b/docs/pages/enterprise/soc2.mdx
@@ -1,7 +1,7 @@
 ---
-title: SOC2 compliance for SSH, Kubernetes and Applications
-description: How to configure SSH, Kubernetes and Application access to be SOC2 compliant
-h1: SOC2 Compliance for SSH and Kubernetes and Application Access
+title: SOC2 compliance for SSH, Kubernetes and Databases
+description: How to configure SOC2-compliant access to SSH, Kubernetes, databases, desktops and web apps
+h1: SOC2 Compliance for SSH, Kubernetes, Databases, Desktops and Web Apps
 ---
 
 Teleport is designed to meet SOC2 requirements for the purposes of accessing infrastructure, change management and system operations. This document outlines a high
diff --git a/docs/pages/enterprise/sso.mdx b/docs/pages/enterprise/sso.mdx
index 171d69ff725f2..1955751cbe639 100644
--- a/docs/pages/enterprise/sso.mdx
+++ b/docs/pages/enterprise/sso.mdx
@@ -1,6 +1,6 @@
 ---
 title: SSO for SSH
-description: How to set up single sign-on (SSO) for SSH using Gravitational Teleport
+description: How to set up single sign-on (SSO) for SSH using Teleport
 h1: Single Sign-On (SSO) for SSH
 ---
 
@@ -9,25 +9,25 @@ through a Single Sign-On (SSO) provider used the rest of the organization.
 
 <TileSet>
   <Tile icon="bolt" title="Azure Active Directory (AD)" href="./sso/azuread.mdx">
-    Configure Azure Active Directory SSO for SSH, Kubernetes, Database and Web apps.
+    Configure Azure Active Directory SSO for SSH, Kubernetes, databases, desktops and web apps.
   </Tile>
   <Tile icon="bolt" title="Active Directory (ADFS)" href="./sso/adfs.mdx">
-    Configure Windows Active Directory SSO for SSH, Kubernetes, Database and Web apps.
+    Configure Windows Active Directory SSO for SSH, Kubernetes, databases, desktops and web apps.
   </Tile>
   <Tile icon="bolt" title="Google Workspace" href="./sso/google-workspace.mdx">
-    Configure Gsuite SSO for SSH, Kubernetes, Database and Web apps.
+    Configure Google Workspace SSO for SSH, Kubernetes, databases, desktops and web apps.
   </Tile>
   <Tile icon="bolt" title="GitLab" href="./sso/gitlab.mdx">
-    Configure Gitlab SSO for SSH, Kubernetes, Database and Web apps.
+    Configure GitLab SSO for SSH, Kubernetes, databases, desktops and web apps.
   </Tile>
   <Tile icon="bolt" title="OneLogin" href="./sso/one-login.mdx">
-    Configure OneLogin SSO for SSH, Kubernetes, Database and Web apps.
+    Configure OneLogin SSO for SSH, Kubernetes, databases, desktops and web apps.
   </Tile>
   <Tile icon="bolt" title="OIDC" href="./sso/oidc.mdx">
-    Configure OIDC SSO for SSH, Kubernetes, Database and Web apps.
+    Configure OIDC SSO for SSH, Kubernetes, databases, desktops and web apps.
   </Tile>
   <Tile icon="bolt" title="Okta" href="./sso/okta.mdx">
-    Configure Okta SSO for SSH, Kubernetes, Database and Web apps.
+    Configure Okta SSO for SSH, Kubernetes, databases, desktops and web apps.
   </Tile>
 </TileSet>
 
@@ -38,7 +38,7 @@ Users need to execute the following command login in the CLI or login using UI:
 ```bsh
 # this command will automatically open the default web browser and take a user
 # through the login process with an SSO provider:
-$ tsh login --proxy=proxy.example.com
+$ tsh login --proxy=proxy.example.com --auth=github
 
 # output:
 If browser window does not open automatically, open it by clicking on the link:
diff --git a/docs/pages/enterprise/workflow/index.mdx b/docs/pages/enterprise/workflow/index.mdx
index a36d3bf73c42b..16fa51de5b5de 100644
--- a/docs/pages/enterprise/workflow/index.mdx
+++ b/docs/pages/enterprise/workflow/index.mdx
@@ -1,6 +1,6 @@
 ---
-title: Access Requests for SSH and Kubernetes Access
-description: How to customize SSH and Kubernetes access using Teleport.
+title: Access Requests for Infrastructure Access
+description: Teleport allows users to request new roles with elevated privileges from the CLI or UI. Requests can be escalated via ChatOps or anywhere else via our flexible Authorization Workflow API.
 h1: Teleport Access Requests
 ---
 
@@ -196,7 +196,7 @@ spec:
     # the `request_prompt` field can be used to tell the user what should
     # be supplied in the request reason field.
     request_prompt: Please provide your ticket ID
-version: v3
+version: v5
 ```
 
 <Admonition
diff --git a/docs/pages/faq.mdx b/docs/pages/faq.mdx
index 482052284e516..fe4858724bf8f 100644
--- a/docs/pages/faq.mdx
+++ b/docs/pages/faq.mdx
@@ -129,8 +129,7 @@ Teleport provides security-critical support for the current and two previous rel
 | 4.4 | Yes | October 20th, 2020 | 3.0.0 |
 | 4.3 (EOL) | Yes | July 8th, 2020 | 3.0.0 |
 | 4.2 (EOL) | Yes | December 19th, 2019 | 3.0.0 |
-| 4.1 (EOL) | Yes | October 1st, 2019 | 3.0.0 |
-| 4.0 (EOL) | Yes | June 18th, 2019 | 3.0.0 |
+
 
 **How should I upgrade my cluster?**
 
@@ -155,7 +154,7 @@ Please refer to the [Ports](./setup/reference/networking.mdx) section of the Adm
 
 ### Does Teleport support authentication via OAuth, SAML, or Active Directory?
 
-Gravitational offers this feature for the [Enterprise versions of Teleport](enterprise/introduction.mdx).
+Teleport offers this feature for the [Enterprise versions of Teleport](enterprise/introduction.mdx).
 
 ### Does Teleport send any data back to the cloud?
 
diff --git a/docs/pages/index.mdx b/docs/pages/index.mdx
index 629dee1ca40ce..1fb1a8a766035 100644
--- a/docs/pages/index.mdx
+++ b/docs/pages/index.mdx
@@ -3,7 +3,7 @@ title: Introduction to Teleport
 description: How to install and quickly get up and running with Teleport to set up SSH and Kubernetes access to cloud environments.
 h1: Introduction
 layout: tocless-doc
-videoBanner: 0HlyGk8dihM
+videoBanner: ErhTeypZ2gw
 ---
 
 ## What is Teleport
diff --git a/docs/pages/production.mdx b/docs/pages/production.mdx
index a1a3dcbe4889c..41e76545f1a8e 100644
--- a/docs/pages/production.mdx
+++ b/docs/pages/production.mdx
@@ -1,6 +1,6 @@
 ---
 title: Teleport Production Guide
-description: How to configure SSH and Kubernetes access with SSO on AWS, GCE, and your own infrastructure.
+description: How to configure secure access with SSO on AWS, GCE, and your own infrastructure.
 h1: Production Guide
 ---
 
@@ -44,7 +44,7 @@ Teleport services listen on several ports. This table shows the default port num
 | `3026` | Kubernetes | Port used for `kubectl` to access Teleport | {/* TODO */} | {/* TODO */} |
 
 {
-  /* TODO: Add several diagrams of firewall config examples */
+  /* TODO: Add several diagrams of firewall config examples. TODO Update for single port */
 }
 
 ## Installation
diff --git a/docs/pages/setup/reference/cli.mdx b/docs/pages/setup/reference/cli.mdx
index 0339c46a3c02c..ec57f8b4d0cae 100644
--- a/docs/pages/setup/reference/cli.mdx
+++ b/docs/pages/setup/reference/cli.mdx
@@ -772,11 +772,10 @@ These flags are available for all commands `--debug, --config`. Run
 
 ```code
 # Adds teleport user "joe" with mappings to
-# OS users "joe" and "root"
-$ tctl users add joe joe,root
-# Adds teleport user "joe" with mappings to
-# OS users "joe" only
-$ tctl users add joe
+# OS users and {{ internal.logins }} to "joe" and "ubuntu"
+$ tctl users add joe --roles=access joe,ubuntu
+# Adds Teleport user "joe" with mappings to the editor role
+$ tctl users add joe --roles=editor
 ```
 
 ### tctl users update
@@ -1008,6 +1007,8 @@ $ tctl tokens add --type=trusted_cluster --labels=env=prod
 # Generate an invite token for a node
 # This is equivalent to `tctl nodes add`
 $ tctl tokens add --type=node
+# Generate a join token for both a Node and the Database Service
+$ tctl tokens add --type=node,db
 # Generate an invite token for a kubernetes_service
 $ tctl tokens add --type=kube
 # Generate an invite token for an app_service