diff --git a/website/content/api-docs/acl/auth-methods.mdx b/website/content/api-docs/acl/auth-methods.mdx
index ac8b5d71b0..9f4ebbbd37 100644
--- a/website/content/api-docs/acl/auth-methods.mdx
+++ b/website/content/api-docs/acl/auth-methods.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: ACL Auth Methods - HTTP API
-sidebar_title: Auth Methods
 description: The /acl/auth-method endpoints manage Consul's ACL Auth Methods.
 ---
 
diff --git a/website/content/api-docs/acl/binding-rules.mdx b/website/content/api-docs/acl/binding-rules.mdx
index 92c0ffb12f..b598a55691 100644
--- a/website/content/api-docs/acl/binding-rules.mdx
+++ b/website/content/api-docs/acl/binding-rules.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: ACL Binding Rules - HTTP API
-sidebar_title: Binding Rules
 description: The /acl/binding-rule endpoints manage Consul's ACL Binding Rules.
 ---
 
diff --git a/website/content/api-docs/acl/index.mdx b/website/content/api-docs/acl/index.mdx
index 65ac35ae22..ee158c8d62 100644
--- a/website/content/api-docs/acl/index.mdx
+++ b/website/content/api-docs/acl/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: ACLs - HTTP API
-sidebar_title: ACLs
 description: The /acl endpoints manage the Consul's ACL system.
 ---
 
diff --git a/website/content/api-docs/acl/legacy.mdx b/website/content/api-docs/acl/legacy.mdx
index bb1476199b..72d7efb10d 100644
--- a/website/content/api-docs/acl/legacy.mdx
+++ b/website/content/api-docs/acl/legacy.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Legacy ACLs - HTTP API
-sidebar_title: Legacy Tokens
 description: >-
   The /acl endpoints create, update, destroy, and query Legacy ACL tokens in
   Consul.
diff --git a/website/content/api-docs/acl/policies.mdx b/website/content/api-docs/acl/policies.mdx
index 0e2c2a8653..6fe426d534 100644
--- a/website/content/api-docs/acl/policies.mdx
+++ b/website/content/api-docs/acl/policies.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: ACL Policies - HTTP API
-sidebar_title: Policies
 description: The /acl/policy endpoints manage Consul's ACL policies.
 ---
 
diff --git a/website/content/api-docs/acl/roles.mdx b/website/content/api-docs/acl/roles.mdx
index 3deecd2316..5862fefcf8 100644
--- a/website/content/api-docs/acl/roles.mdx
+++ b/website/content/api-docs/acl/roles.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: ACL Roles - HTTP API
-sidebar_title: Roles
 description: The /acl/role endpoints manage Consul's ACL Roles.
 ---
 
diff --git a/website/content/api-docs/acl/tokens.mdx b/website/content/api-docs/acl/tokens.mdx
index 46ec0a0bc8..70634cbf4e 100644
--- a/website/content/api-docs/acl/tokens.mdx
+++ b/website/content/api-docs/acl/tokens.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: ACL Tokens - HTTP API
-sidebar_title: Tokens
 description: The /acl/token endpoints manage Consul's ACL Tokens.
 ---
 
diff --git a/website/content/api-docs/agent/check.mdx b/website/content/api-docs/agent/check.mdx
index 194df3d7aa..c5cf353e25 100644
--- a/website/content/api-docs/agent/check.mdx
+++ b/website/content/api-docs/agent/check.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Check - Agent - HTTP API
-sidebar_title: Checks
 description: The /agent/check endpoints interact with checks on the local agent in Consul.
 ---
 
diff --git a/website/content/api-docs/agent/connect.mdx b/website/content/api-docs/agent/connect.mdx
index d18a158ad0..e319c60319 100644
--- a/website/content/api-docs/agent/connect.mdx
+++ b/website/content/api-docs/agent/connect.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Connect - Agent - HTTP API
-sidebar_title: Connect
 description: >-
   The /agent/connect endpoints interact with Connect with agent-local
   operations.
diff --git a/website/content/api-docs/agent/index.mdx b/website/content/api-docs/agent/index.mdx
index a30002f08a..7230f2bbe6 100644
--- a/website/content/api-docs/agent/index.mdx
+++ b/website/content/api-docs/agent/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Agent - HTTP API
-sidebar_title: Agent
 description: |-
   The /agent endpoints interact with the local Consul agent to register
   services, checks, list members, and more.
diff --git a/website/content/api-docs/agent/service.mdx b/website/content/api-docs/agent/service.mdx
index 9929a93a2f..5ea91f7172 100644
--- a/website/content/api-docs/agent/service.mdx
+++ b/website/content/api-docs/agent/service.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Service - Agent - HTTP API
-sidebar_title: Services
 description: |-
   The /agent/service endpoints interact with services on the local agent in
   Consul.
diff --git a/website/content/api-docs/catalog.mdx b/website/content/api-docs/catalog.mdx
index d2728f9ef0..484bf56a19 100644
--- a/website/content/api-docs/catalog.mdx
+++ b/website/content/api-docs/catalog.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Catalog - HTTP API
-sidebar_title: Catalog
 description: |-
   The /catalog endpoints register and deregister nodes, services, and checks in
   Consul.
diff --git a/website/content/api-docs/config.mdx b/website/content/api-docs/config.mdx
index c0f3104c3b..96d73f7259 100644
--- a/website/content/api-docs/config.mdx
+++ b/website/content/api-docs/config.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Config - HTTP API
-sidebar_title: Config
 description: |-
   The /config endpoints are for managing centralized configuration
   in Consul.
diff --git a/website/content/api-docs/connect/ca.mdx b/website/content/api-docs/connect/ca.mdx
index 10542175bb..d4077f054f 100644
--- a/website/content/api-docs/connect/ca.mdx
+++ b/website/content/api-docs/connect/ca.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Certificate Authority - Connect - HTTP API
-sidebar_title: Certificate Authority (CA)
 description: |-
   The /connect/ca endpoints provide tools for interacting with Connect's
   Certificate Authority mechanism via Consul's HTTP API.
diff --git a/website/content/api-docs/connect/index.mdx b/website/content/api-docs/connect/index.mdx
index 48dd737caf..508c30b1d6 100644
--- a/website/content/api-docs/connect/index.mdx
+++ b/website/content/api-docs/connect/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Connect - HTTP API
-sidebar_title: Connect
 description: >-
   The `/connect` endpoints provide access to Connect-related operations for
   intentions and the certificate authority.
diff --git a/website/content/api-docs/connect/intentions.mdx b/website/content/api-docs/connect/intentions.mdx
index aa182039e2..f95a23a443 100644
--- a/website/content/api-docs/connect/intentions.mdx
+++ b/website/content/api-docs/connect/intentions.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Intentions - Connect - HTTP API
-sidebar_title: Intentions
 description: |-
   The /connect/intentions endpoint provide tools for managing intentions via
   Consul's HTTP API.
diff --git a/website/content/api-docs/coordinate.mdx b/website/content/api-docs/coordinate.mdx
index 50d795868a..9f47924764 100644
--- a/website/content/api-docs/coordinate.mdx
+++ b/website/content/api-docs/coordinate.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Coordinate - HTTP API
-sidebar_title: Coordinates
 description: |-
   The /coordinate endpoints query for the network coordinates for nodes in the
   local datacenter as well as Consul servers in the local datacenter and remote
diff --git a/website/content/api-docs/discovery-chain.mdx b/website/content/api-docs/discovery-chain.mdx
index 3ef98b1fb4..909a1d605b 100644
--- a/website/content/api-docs/discovery-chain.mdx
+++ b/website/content/api-docs/discovery-chain.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Discovery Chain - HTTP API
-sidebar_title: Discovery Chain
 description: The /discovery-chain endpoints are for interacting with the discovery chain.
 ---
 
diff --git a/website/content/api-docs/event.mdx b/website/content/api-docs/event.mdx
index 00c86eecd6..8773a337cf 100644
--- a/website/content/api-docs/event.mdx
+++ b/website/content/api-docs/event.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Events - HTTP API
-sidebar_title: Events
 description: |-
   The /event endpoints fire new events and to query the available events in
   Consul.
diff --git a/website/content/api-docs/features/blocking.mdx b/website/content/api-docs/features/blocking.mdx
index cdf6c8b8f2..093bd1e545 100644
--- a/website/content/api-docs/features/blocking.mdx
+++ b/website/content/api-docs/features/blocking.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Blocking Queries
-sidebar_title: Blocking Queries
 description: |-
   Many endpoints in Consul support a feature known as "blocking queries". A
   blocking query is used to wait for a potential change using long polling.
diff --git a/website/content/api-docs/features/caching.mdx b/website/content/api-docs/features/caching.mdx
index aa707a21d7..a3fc18174c 100644
--- a/website/content/api-docs/features/caching.mdx
+++ b/website/content/api-docs/features/caching.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Agent Caching
-sidebar_title: Agent Caching
 description: |-
   Some read endpoints support agent caching. They are clearly marked in the
   documentation.
diff --git a/website/content/api-docs/features/consistency.mdx b/website/content/api-docs/features/consistency.mdx
index 7f3e0ea0fe..a50658069c 100644
--- a/website/content/api-docs/features/consistency.mdx
+++ b/website/content/api-docs/features/consistency.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Consistency Modes
-sidebar_title: Consistency Modes
 description: >-
   Most of the read query endpoints support multiple levels of consistency. Since
   no policy will suit all clients' needs, these consistency modes allow the user
diff --git a/website/content/api-docs/features/filtering.mdx b/website/content/api-docs/features/filtering.mdx
index eed6cb71b0..d7edea290b 100644
--- a/website/content/api-docs/features/filtering.mdx
+++ b/website/content/api-docs/features/filtering.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Filtering
-sidebar_title: Filtering
 description: |-
   Consul exposes a RESTful HTTP API to control almost every aspect of the
   Consul agent.
diff --git a/website/content/api-docs/health.mdx b/website/content/api-docs/health.mdx
index d9ee39e29f..c8bf233e5b 100644
--- a/website/content/api-docs/health.mdx
+++ b/website/content/api-docs/health.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Health - HTTP API
-sidebar_title: Health
 description: |-
   The /health endpoints query health-related information for services and checks
   in Consul.
diff --git a/website/content/api-docs/index.mdx b/website/content/api-docs/index.mdx
index 0f1d09919d..a0194850a3 100644
--- a/website/content/api-docs/index.mdx
+++ b/website/content/api-docs/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: HTTP API
-sidebar_title: API Introduction
 description: |-
   Consul exposes a RESTful HTTP API to control almost every aspect of the
   Consul agent.
diff --git a/website/content/api-docs/kv.mdx b/website/content/api-docs/kv.mdx
index f5dcfc6aad..549abdf683 100644
--- a/website/content/api-docs/kv.mdx
+++ b/website/content/api-docs/kv.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: KV Store - HTTP API
-sidebar_title: KV Store
 description: |-
   The /kv endpoints access Consul's simple key/value store, useful for storing
   service configuration or other metadata.
diff --git a/website/content/api-docs/libraries-and-sdks.mdx b/website/content/api-docs/libraries-and-sdks.mdx
index 61a03b89f5..1c71c3dc23 100644
--- a/website/content/api-docs/libraries-and-sdks.mdx
+++ b/website/content/api-docs/libraries-and-sdks.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Libraries and SDKs - HTTP API
-sidebar_title: Libraries & SDKs
 description: |-
   There are many third-party libraries for interacting with Consul's HTTP API.
   This page lists the HashiCorp and community-maintained Consul HTTP API client
diff --git a/website/content/api-docs/namespaces.mdx b/website/content/api-docs/namespaces.mdx
index a6dc14aef7..bec1d7aa4f 100644
--- a/website/content/api-docs/namespaces.mdx
+++ b/website/content/api-docs/namespaces.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Namespace - HTTP API
-sidebar_title: Namespaces
 description: The /namespace endpoints allow for managing Consul Enterprise Namespaces.
 ---
 
diff --git a/website/content/api-docs/operator/area.mdx b/website/content/api-docs/operator/area.mdx
index 3056ba9364..6d941ca3d5 100644
--- a/website/content/api-docs/operator/area.mdx
+++ b/website/content/api-docs/operator/area.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Network Areas - Operator - HTTP API
-sidebar_title: Area
 description: |-
   The /operator/area endpoints expose the network tomography information via
   Consul's HTTP API.
diff --git a/website/content/api-docs/operator/autopilot.mdx b/website/content/api-docs/operator/autopilot.mdx
index 3a89ea91f6..ed568e6484 100644
--- a/website/content/api-docs/operator/autopilot.mdx
+++ b/website/content/api-docs/operator/autopilot.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Autopilot - Operator - HTTP API
-sidebar_title: Autopilot
 description: |-
   The /operator/autopilot endpoints allow for automatic operator-friendly
   management of Consul servers including cleanup of dead servers, monitoring
diff --git a/website/content/api-docs/operator/index.mdx b/website/content/api-docs/operator/index.mdx
index fe40266641..84efd335c1 100644
--- a/website/content/api-docs/operator/index.mdx
+++ b/website/content/api-docs/operator/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Operator - HTTP API
-sidebar_title: Operator
 description: |-
   The /operator endpoints provide cluster-level tools for Consul operators,
   such as interacting with the Raft subsystem.
diff --git a/website/content/api-docs/operator/keyring.mdx b/website/content/api-docs/operator/keyring.mdx
index a8866e957b..4a1e868875 100644
--- a/website/content/api-docs/operator/keyring.mdx
+++ b/website/content/api-docs/operator/keyring.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Keyring - Operator - HTTP API
-sidebar_title: Keyring
 description: |-
   The /operator/keyring endpoints allow for management of the gossip encryption
   keyring.
diff --git a/website/content/api-docs/operator/license.mdx b/website/content/api-docs/operator/license.mdx
index 6986232f0f..9ea06b6811 100644
--- a/website/content/api-docs/operator/license.mdx
+++ b/website/content/api-docs/operator/license.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: License - Operator - HTTP API
-sidebar_title: License
 description: |-
   The /operator/license endpoints allow for setting and retrieving the Consul
   Enterprise License.
diff --git a/website/content/api-docs/operator/raft.mdx b/website/content/api-docs/operator/raft.mdx
index 483dcaacd3..b56211b2cb 100644
--- a/website/content/api-docs/operator/raft.mdx
+++ b/website/content/api-docs/operator/raft.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Raft - Operator - HTTP API
-sidebar_title: Raft
 description: |-
   The /operator/raft endpoints provide tools for management of Raft the
   consensus subsystem and cluster quorum.
diff --git a/website/content/api-docs/operator/segment.mdx b/website/content/api-docs/operator/segment.mdx
index 70d2e129e0..7c6f46f6df 100644
--- a/website/content/api-docs/operator/segment.mdx
+++ b/website/content/api-docs/operator/segment.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Network Segments - Operator - HTTP API
-sidebar_title: Segment
 description: |-
   The /operator/segment endpoint exposes the network segment information via
   Consul's HTTP API.
diff --git a/website/content/api-docs/query.mdx b/website/content/api-docs/query.mdx
index cf267a3996..2144b9c9af 100644
--- a/website/content/api-docs/query.mdx
+++ b/website/content/api-docs/query.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Prepared Queries - HTTP API
-sidebar_title: Prepared Queries
 description: The /query endpoints manage and execute prepared queries in Consul.
 ---
 
diff --git a/website/content/api-docs/session.mdx b/website/content/api-docs/session.mdx
index c9c05b0bc6..8334e5951d 100644
--- a/website/content/api-docs/session.mdx
+++ b/website/content/api-docs/session.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Session - HTTP API
-sidebar_title: Sessions
 description: 'The /session endpoints create, destroy, and query sessions in Consul.'
 ---
 
diff --git a/website/content/api-docs/snapshot.mdx b/website/content/api-docs/snapshot.mdx
index a416ae01bd..d94248a1b3 100644
--- a/website/content/api-docs/snapshot.mdx
+++ b/website/content/api-docs/snapshot.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Snapshot - HTTP API
-sidebar_title: Snapshots
 description: |-
   The /snapshot endpoints save and restore Consul's server state for disaster
   recovery.
diff --git a/website/content/api-docs/status.mdx b/website/content/api-docs/status.mdx
index 2e7d65ea3a..e2ad3ad9ea 100644
--- a/website/content/api-docs/status.mdx
+++ b/website/content/api-docs/status.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Status - HTTP API
-sidebar_title: Status
 description: |-
   The /status endpoints return information about the status of the Consul
   cluster. This information is generally very low level and not often useful for
diff --git a/website/content/api-docs/txn.mdx b/website/content/api-docs/txn.mdx
index ae12697463..bf5a3fdfa3 100644
--- a/website/content/api-docs/txn.mdx
+++ b/website/content/api-docs/txn.mdx
@@ -1,7 +1,6 @@
 ---
 layout: api
 page_title: Transaction - HTTP API
-sidebar_title: Transactions
 description: >-
   The /txn endpoint manages multiple operations in Consul, including catalog
   updates and fetches of multiple KV entries inside a single, atomic
diff --git a/website/content/commands/acl/auth-method/create.mdx b/website/content/commands/acl/auth-method/create.mdx
index e685c0684a..5a24f18bc6 100644
--- a/website/content/commands/acl/auth-method/create.mdx
+++ b/website/content/commands/acl/auth-method/create.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Auth Method Create'
-sidebar_title: create
 ---
 
 # Consul ACL Auth Method Create
diff --git a/website/content/commands/acl/auth-method/delete.mdx b/website/content/commands/acl/auth-method/delete.mdx
index 3a25521e88..7bd27ed20b 100644
--- a/website/content/commands/acl/auth-method/delete.mdx
+++ b/website/content/commands/acl/auth-method/delete.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Auth Method Delete'
-sidebar_title: delete
 ---
 
 # Consul ACL Auth Method Delete
diff --git a/website/content/commands/acl/auth-method/index.mdx b/website/content/commands/acl/auth-method/index.mdx
index d2ca568598..1ae28de783 100644
--- a/website/content/commands/acl/auth-method/index.mdx
+++ b/website/content/commands/acl/auth-method/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Auth Methods'
-sidebar_title: auth-method
 ---
 
 # Consul ACL Auth Methods
diff --git a/website/content/commands/acl/auth-method/list.mdx b/website/content/commands/acl/auth-method/list.mdx
index 933b9c1875..f092f348d4 100644
--- a/website/content/commands/acl/auth-method/list.mdx
+++ b/website/content/commands/acl/auth-method/list.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Auth Method List'
-sidebar_title: list
 ---
 
 # Consul ACL Auth Method List
diff --git a/website/content/commands/acl/auth-method/read.mdx b/website/content/commands/acl/auth-method/read.mdx
index 20ed1f5264..e24a230e8e 100644
--- a/website/content/commands/acl/auth-method/read.mdx
+++ b/website/content/commands/acl/auth-method/read.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Auth Method Read'
-sidebar_title: read
 ---
 
 # Consul ACL Auth Method Read
diff --git a/website/content/commands/acl/auth-method/update.mdx b/website/content/commands/acl/auth-method/update.mdx
index c403c583ef..78712007ec 100644
--- a/website/content/commands/acl/auth-method/update.mdx
+++ b/website/content/commands/acl/auth-method/update.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Auth Method Update'
-sidebar_title: update
 ---
 
 # Consul ACL Auth Method Update
diff --git a/website/content/commands/acl/binding-rule/create.mdx b/website/content/commands/acl/binding-rule/create.mdx
index d4bfef9aaf..5f69d044da 100644
--- a/website/content/commands/acl/binding-rule/create.mdx
+++ b/website/content/commands/acl/binding-rule/create.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Binding Rule Create'
-sidebar_title: create
 ---
 
 # Consul ACL Binding Rule Create
diff --git a/website/content/commands/acl/binding-rule/delete.mdx b/website/content/commands/acl/binding-rule/delete.mdx
index 01d9efb32c..7e9094e19f 100644
--- a/website/content/commands/acl/binding-rule/delete.mdx
+++ b/website/content/commands/acl/binding-rule/delete.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Binding Rule Delete'
-sidebar_title: delete
 ---
 
 # Consul ACL Binding Rule Delete
diff --git a/website/content/commands/acl/binding-rule/index.mdx b/website/content/commands/acl/binding-rule/index.mdx
index 0c24bb8196..440bd92e05 100644
--- a/website/content/commands/acl/binding-rule/index.mdx
+++ b/website/content/commands/acl/binding-rule/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Binding Rule'
-sidebar_title: binding-rule
 ---
 
 # Consul ACL Binding Rules
diff --git a/website/content/commands/acl/binding-rule/list.mdx b/website/content/commands/acl/binding-rule/list.mdx
index 418e4a685c..459508c085 100644
--- a/website/content/commands/acl/binding-rule/list.mdx
+++ b/website/content/commands/acl/binding-rule/list.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Binding Rule List'
-sidebar_title: list
 ---
 
 # Consul ACL Binding Rule List
diff --git a/website/content/commands/acl/binding-rule/read.mdx b/website/content/commands/acl/binding-rule/read.mdx
index dbafa02ed0..301b0ac515 100644
--- a/website/content/commands/acl/binding-rule/read.mdx
+++ b/website/content/commands/acl/binding-rule/read.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Binding Rule Read'
-sidebar_title: read
 ---
 
 # Consul ACL Binding Rule Read
diff --git a/website/content/commands/acl/binding-rule/update.mdx b/website/content/commands/acl/binding-rule/update.mdx
index 78346fbc28..163379d2b4 100644
--- a/website/content/commands/acl/binding-rule/update.mdx
+++ b/website/content/commands/acl/binding-rule/update.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Binding Rule Update'
-sidebar_title: update
 ---
 
 # Consul ACL Binding Rule Update
diff --git a/website/content/commands/acl/bootstrap.mdx b/website/content/commands/acl/bootstrap.mdx
index 3e34bc798e..92c651b849 100644
--- a/website/content/commands/acl/bootstrap.mdx
+++ b/website/content/commands/acl/bootstrap.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Bootstrap'
-sidebar_title: bootstrap
 ---
 
 # Consul ACL Bootstrap
diff --git a/website/content/commands/acl/index.mdx b/website/content/commands/acl/index.mdx
index 901c2a2fde..94dd015de1 100644
--- a/website/content/commands/acl/index.mdx
+++ b/website/content/commands/acl/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL'
-sidebar_title: acl
 ---
 
 # Consul ACLs
diff --git a/website/content/commands/acl/policy/create.mdx b/website/content/commands/acl/policy/create.mdx
index 2a26492429..f462af9e66 100644
--- a/website/content/commands/acl/policy/create.mdx
+++ b/website/content/commands/acl/policy/create.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Policy Create'
-sidebar_title: create
 ---
 
 # Consul ACL Policy Create
diff --git a/website/content/commands/acl/policy/delete.mdx b/website/content/commands/acl/policy/delete.mdx
index 039f87d52e..e734799718 100644
--- a/website/content/commands/acl/policy/delete.mdx
+++ b/website/content/commands/acl/policy/delete.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Policy Delete'
-sidebar_title: delete
 ---
 
 # Consul ACL Policy Delete
diff --git a/website/content/commands/acl/policy/index.mdx b/website/content/commands/acl/policy/index.mdx
index e153e21047..79f4a136a3 100644
--- a/website/content/commands/acl/policy/index.mdx
+++ b/website/content/commands/acl/policy/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Policy'
-sidebar_title: policy
 ---
 
 # Consul ACL Policies
diff --git a/website/content/commands/acl/policy/list.mdx b/website/content/commands/acl/policy/list.mdx
index d1da9799af..4ee2a161b5 100644
--- a/website/content/commands/acl/policy/list.mdx
+++ b/website/content/commands/acl/policy/list.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Policy List'
-sidebar_title: list
 ---
 
 # Consul ACL Policy List
diff --git a/website/content/commands/acl/policy/read.mdx b/website/content/commands/acl/policy/read.mdx
index cc5243b3c6..d6392203bc 100644
--- a/website/content/commands/acl/policy/read.mdx
+++ b/website/content/commands/acl/policy/read.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Policy Read'
-sidebar_title: read
 ---
 
 # Consul ACL Policy Read
diff --git a/website/content/commands/acl/policy/update.mdx b/website/content/commands/acl/policy/update.mdx
index a517e06389..6f28d46c66 100644
--- a/website/content/commands/acl/policy/update.mdx
+++ b/website/content/commands/acl/policy/update.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Policy Update'
-sidebar_title: update
 ---
 
 # Consul ACL Policy Update
diff --git a/website/content/commands/acl/role/create.mdx b/website/content/commands/acl/role/create.mdx
index f7b450eb67..a9aa21effb 100644
--- a/website/content/commands/acl/role/create.mdx
+++ b/website/content/commands/acl/role/create.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Role Create'
-sidebar_title: create
 ---
 
 # Consul ACL Role Create
diff --git a/website/content/commands/acl/role/delete.mdx b/website/content/commands/acl/role/delete.mdx
index e46258b509..396e783a1a 100644
--- a/website/content/commands/acl/role/delete.mdx
+++ b/website/content/commands/acl/role/delete.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Role Delete'
-sidebar_title: delete
 ---
 
 # Consul ACL Role Delete
diff --git a/website/content/commands/acl/role/index.mdx b/website/content/commands/acl/role/index.mdx
index 238202ddab..422c514afd 100644
--- a/website/content/commands/acl/role/index.mdx
+++ b/website/content/commands/acl/role/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Role'
-sidebar_title: role
 ---
 
 # Consul ACL Roles
diff --git a/website/content/commands/acl/role/list.mdx b/website/content/commands/acl/role/list.mdx
index ddfc0ac213..d7eb7a3d7c 100644
--- a/website/content/commands/acl/role/list.mdx
+++ b/website/content/commands/acl/role/list.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Role List'
-sidebar_title: list
 ---
 
 # Consul ACL Role List
diff --git a/website/content/commands/acl/role/read.mdx b/website/content/commands/acl/role/read.mdx
index d9002e1221..9bc9a24c02 100644
--- a/website/content/commands/acl/role/read.mdx
+++ b/website/content/commands/acl/role/read.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Role Read'
-sidebar_title: read
 ---
 
 # Consul ACL Role Read
diff --git a/website/content/commands/acl/role/update.mdx b/website/content/commands/acl/role/update.mdx
index 61a2851be7..66ef268ab0 100644
--- a/website/content/commands/acl/role/update.mdx
+++ b/website/content/commands/acl/role/update.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Role Update'
-sidebar_title: update
 ---
 
 # Consul ACL Role Update
diff --git a/website/content/commands/acl/set-agent-token.mdx b/website/content/commands/acl/set-agent-token.mdx
index cb07fda30e..5017daba84 100644
--- a/website/content/commands/acl/set-agent-token.mdx
+++ b/website/content/commands/acl/set-agent-token.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Set Agent Token'
-sidebar_title: set-agent-token
 ---
 
 # Consul ACL Set Agent Token
diff --git a/website/content/commands/acl/token/clone.mdx b/website/content/commands/acl/token/clone.mdx
index 88397a3002..f60ddce264 100644
--- a/website/content/commands/acl/token/clone.mdx
+++ b/website/content/commands/acl/token/clone.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Token Clone'
-sidebar_title: clone
 ---
 
 # Consul ACL Token Clone
diff --git a/website/content/commands/acl/token/create.mdx b/website/content/commands/acl/token/create.mdx
index 454cb95d06..6ebc72c4b4 100644
--- a/website/content/commands/acl/token/create.mdx
+++ b/website/content/commands/acl/token/create.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Token Create'
-sidebar_title: create
 ---
 
 # Consul ACL Token Create
diff --git a/website/content/commands/acl/token/delete.mdx b/website/content/commands/acl/token/delete.mdx
index 9772cc8b23..68bb438671 100644
--- a/website/content/commands/acl/token/delete.mdx
+++ b/website/content/commands/acl/token/delete.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Token Delete'
-sidebar_title: delete
 ---
 
 # Consul ACL Token Delete
diff --git a/website/content/commands/acl/token/index.mdx b/website/content/commands/acl/token/index.mdx
index 2c28c1ab14..2198eb572e 100644
--- a/website/content/commands/acl/token/index.mdx
+++ b/website/content/commands/acl/token/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Token'
-sidebar_title: token
 ---
 
 # Consul ACL Tokens
diff --git a/website/content/commands/acl/token/list.mdx b/website/content/commands/acl/token/list.mdx
index a43ac075b9..e6d50b34ab 100644
--- a/website/content/commands/acl/token/list.mdx
+++ b/website/content/commands/acl/token/list.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Token List'
-sidebar_title: list
 ---
 
 # Consul ACL Token List
diff --git a/website/content/commands/acl/token/read.mdx b/website/content/commands/acl/token/read.mdx
index 4cfa070218..c6972c7730 100644
--- a/website/content/commands/acl/token/read.mdx
+++ b/website/content/commands/acl/token/read.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Token Read'
-sidebar_title: read
 ---
 
 # Consul ACL Token Read
diff --git a/website/content/commands/acl/token/update.mdx b/website/content/commands/acl/token/update.mdx
index 543a3660d2..72a40c218b 100644
--- a/website/content/commands/acl/token/update.mdx
+++ b/website/content/commands/acl/token/update.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Token Update'
-sidebar_title: update
 ---
 
 # Consul ACL Token Update
diff --git a/website/content/commands/acl/translate-rules.mdx b/website/content/commands/acl/translate-rules.mdx
index e11b03da99..69994cceef 100644
--- a/website/content/commands/acl/translate-rules.mdx
+++ b/website/content/commands/acl/translate-rules.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: ACL Translate Rules'
-sidebar_title: translate-rules
 ---
 
 -> **Deprecated:** This command exists only as a convenience to make legacy ACL migration easier.
diff --git a/website/content/commands/agent.mdx b/website/content/commands/agent.mdx
index 3cf0123a91..771954e4ab 100644
--- a/website/content/commands/agent.mdx
+++ b/website/content/commands/agent.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Agent'
-sidebar_title: agent
 description: >-
   The `consul agent` command is the heart of Consul: it runs the agent that
   performs the important task of maintaining membership information, running
diff --git a/website/content/commands/catalog/datacenters.mdx b/website/content/commands/catalog/datacenters.mdx
index 1d2cd5a6d4..a47b8a399c 100644
--- a/website/content/commands/catalog/datacenters.mdx
+++ b/website/content/commands/catalog/datacenters.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Catalog List Datacenters'
-sidebar_title: datacenters
 ---
 
 # Consul Catalog List Datacenters
diff --git a/website/content/commands/catalog/index.mdx b/website/content/commands/catalog/index.mdx
index 925d3211ef..c95bae5372 100644
--- a/website/content/commands/catalog/index.mdx
+++ b/website/content/commands/catalog/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Catalog'
-sidebar_title: catalog
 ---
 
 # Consul Catalog
diff --git a/website/content/commands/catalog/nodes.mdx b/website/content/commands/catalog/nodes.mdx
index f07ddab288..fe84239463 100644
--- a/website/content/commands/catalog/nodes.mdx
+++ b/website/content/commands/catalog/nodes.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Catalog List Nodes'
-sidebar_title: nodes
 ---
 
 # Consul Catalog List Nodes
diff --git a/website/content/commands/catalog/services.mdx b/website/content/commands/catalog/services.mdx
index ca2192080c..307d571d89 100644
--- a/website/content/commands/catalog/services.mdx
+++ b/website/content/commands/catalog/services.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Catalog List Services'
-sidebar_title: services
 ---
 
 # Consul Catalog List Services
diff --git a/website/content/commands/config/delete.mdx b/website/content/commands/config/delete.mdx
index 928efe8a8e..d500d526e2 100644
--- a/website/content/commands/config/delete.mdx
+++ b/website/content/commands/config/delete.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Config Delete'
-sidebar_title: delete
 ---
 
 # Consul Config Delete
diff --git a/website/content/commands/config/index.mdx b/website/content/commands/config/index.mdx
index a969ecd8db..1d3abe7c46 100644
--- a/website/content/commands/config/index.mdx
+++ b/website/content/commands/config/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Config'
-sidebar_title: config
 ---
 
 # Consul Config
diff --git a/website/content/commands/config/list.mdx b/website/content/commands/config/list.mdx
index 1930ec6482..0b7245f193 100644
--- a/website/content/commands/config/list.mdx
+++ b/website/content/commands/config/list.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Config List'
-sidebar_title: list
 ---
 
 # Consul Config List
diff --git a/website/content/commands/config/read.mdx b/website/content/commands/config/read.mdx
index 4fe07e1bd8..cbc7aae7f2 100644
--- a/website/content/commands/config/read.mdx
+++ b/website/content/commands/config/read.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Config Read'
-sidebar_title: read
 ---
 
 # Consul Config Read
diff --git a/website/content/commands/config/write.mdx b/website/content/commands/config/write.mdx
index 429a69c956..fe7afaa817 100644
--- a/website/content/commands/config/write.mdx
+++ b/website/content/commands/config/write.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Config Write'
-sidebar_title: write
 ---
 
 # Consul Config Write
diff --git a/website/content/commands/connect/ca.mdx b/website/content/commands/connect/ca.mdx
index 8d82466841..adca2c1896 100644
--- a/website/content/commands/connect/ca.mdx
+++ b/website/content/commands/connect/ca.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Connect CA'
-sidebar_title: ca
 description: >
   The connect CA subcommand is used to view and modify the Connect Certificate
   Authority (CA) configuration.
diff --git a/website/content/commands/connect/envoy.mdx b/website/content/commands/connect/envoy.mdx
index 185ea5bc9f..27de4ed678 100644
--- a/website/content/commands/connect/envoy.mdx
+++ b/website/content/commands/connect/envoy.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Connect Proxy'
-sidebar_title: envoy
 description: The connect proxy subcommand is used to run the Envoy proxy for Connect.
 ---
 
diff --git a/website/content/commands/connect/expose.mdx b/website/content/commands/connect/expose.mdx
index a590517bf2..779b308fe0 100644
--- a/website/content/commands/connect/expose.mdx
+++ b/website/content/commands/connect/expose.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Connect Expose'
-sidebar_title: expose
 description: >
   The connect expose subcommand is used to expose a Connect-enabled service 
   through an Ingress gateway by modifying the gateway's configuration and adding
diff --git a/website/content/commands/connect/index.mdx b/website/content/commands/connect/index.mdx
index 72465ca526..767ac41a63 100644
--- a/website/content/commands/connect/index.mdx
+++ b/website/content/commands/connect/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Connect'
-sidebar_title: connect
 ---
 
 # Consul Connect
diff --git a/website/content/commands/connect/proxy.mdx b/website/content/commands/connect/proxy.mdx
index 7181f1122e..036e8a5887 100644
--- a/website/content/commands/connect/proxy.mdx
+++ b/website/content/commands/connect/proxy.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Connect Proxy'
-sidebar_title: proxy
 description: >
   The connect proxy subcommand is used to run the built-in mTLS proxy for
   Connect.
diff --git a/website/content/commands/debug.mdx b/website/content/commands/debug.mdx
index 9c2bad0964..cf93b5d63d 100644
--- a/website/content/commands/debug.mdx
+++ b/website/content/commands/debug.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Debug'
-sidebar_title: debug
 ---
 
 # Consul Debug
diff --git a/website/content/commands/event.mdx b/website/content/commands/event.mdx
index a0453b6f4c..5ae7669518 100644
--- a/website/content/commands/event.mdx
+++ b/website/content/commands/event.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Event'
-sidebar_title: event
 description: >-
   The event command provides a mechanism to fire a custom user event to an
   entire datacenter. These events are opaque to Consul, but they can be used to
diff --git a/website/content/commands/exec.mdx b/website/content/commands/exec.mdx
index ca793daa05..8bae11c8f1 100644
--- a/website/content/commands/exec.mdx
+++ b/website/content/commands/exec.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Exec'
-sidebar_title: exec
 description: >-
   The exec command provides a mechanism for remote execution. For example, this
   can be used to run the `uptime` command across all machines providing the
diff --git a/website/content/commands/force-leave.mdx b/website/content/commands/force-leave.mdx
index cbb1ad27e0..80b31f4588 100644
--- a/website/content/commands/force-leave.mdx
+++ b/website/content/commands/force-leave.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Force Leave'
-sidebar_title: force-leave
 description: >-
   The `force-leave` command forces a member of a Consul cluster to enter the
   left state. If the member is still actually alive, it will eventually rejoin
diff --git a/website/content/commands/index.mdx b/website/content/commands/index.mdx
index 03d5b68448..2ecd76563b 100644
--- a/website/content/commands/index.mdx
+++ b/website/content/commands/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: Commands
-sidebar_title: Commands (CLI)
 description: >-
   Consul is controlled via a very easy to use command-line interface (CLI).
   Consul is only a single command-line application: `consul`. This application
diff --git a/website/content/commands/info.mdx b/website/content/commands/info.mdx
index 24618ae274..bc8e78f66a 100644
--- a/website/content/commands/info.mdx
+++ b/website/content/commands/info.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Info'
-sidebar_title: info
 description: >-
   The `info` command provides various debugging information that can be useful
   to operators. Depending on if the agent is a client or server, information
diff --git a/website/content/commands/intention/check.mdx b/website/content/commands/intention/check.mdx
index bd6a8f8376..fb84900b53 100644
--- a/website/content/commands/intention/check.mdx
+++ b/website/content/commands/intention/check.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Intention Check'
-sidebar_title: check
 ---
 
 # Consul Intention Check
diff --git a/website/content/commands/intention/create.mdx b/website/content/commands/intention/create.mdx
index 4a820c404d..fdc8c7ec7f 100644
--- a/website/content/commands/intention/create.mdx
+++ b/website/content/commands/intention/create.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Intention Create'
-sidebar_title: create
 ---
 
 # Consul Intention Create
diff --git a/website/content/commands/intention/delete.mdx b/website/content/commands/intention/delete.mdx
index 80baf37b8f..d1fe6bb511 100644
--- a/website/content/commands/intention/delete.mdx
+++ b/website/content/commands/intention/delete.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Intention Delete'
-sidebar_title: delete
 ---
 
 # Consul Intention Delete
diff --git a/website/content/commands/intention/get.mdx b/website/content/commands/intention/get.mdx
index b40023c6c2..f37c321b1f 100644
--- a/website/content/commands/intention/get.mdx
+++ b/website/content/commands/intention/get.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Intention Get'
-sidebar_title: get
 ---
 
 # Consul Intention Get
diff --git a/website/content/commands/intention/index.mdx b/website/content/commands/intention/index.mdx
index 85cf72cc0a..41b621db32 100644
--- a/website/content/commands/intention/index.mdx
+++ b/website/content/commands/intention/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Intention'
-sidebar_title: intention
 ---
 
 # Consul Intention
diff --git a/website/content/commands/intention/list.mdx b/website/content/commands/intention/list.mdx
index 54168e2eef..f742f6e311 100644
--- a/website/content/commands/intention/list.mdx
+++ b/website/content/commands/intention/list.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Intention List'
-sidebar_title: list
 ---
 
 # Consul Intention List
diff --git a/website/content/commands/intention/match.mdx b/website/content/commands/intention/match.mdx
index 4b2cea4e28..d210bc432d 100644
--- a/website/content/commands/intention/match.mdx
+++ b/website/content/commands/intention/match.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Intention Match'
-sidebar_title: match
 ---
 
 # Consul Intention Match
diff --git a/website/content/commands/join.mdx b/website/content/commands/join.mdx
index c2c8e295e4..8968ace5fd 100644
--- a/website/content/commands/join.mdx
+++ b/website/content/commands/join.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Join'
-sidebar_title: join
 description: >-
   The `join` command tells a Consul agent to join an existing cluster. A new
   Consul agent may join any node in the existing cluster. After joining with one
diff --git a/website/content/commands/keygen.mdx b/website/content/commands/keygen.mdx
index 0a48ff909d..531efb1364 100644
--- a/website/content/commands/keygen.mdx
+++ b/website/content/commands/keygen.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Keygen'
-sidebar_title: keygen
 description: >-
   The `keygen` command generates an encryption key that can be used for Consul
   agent traffic encryption. The keygen command uses a cryptographically strong
diff --git a/website/content/commands/keyring.mdx b/website/content/commands/keyring.mdx
index 1b415ad052..168a46ca6b 100644
--- a/website/content/commands/keyring.mdx
+++ b/website/content/commands/keyring.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Keyring'
-sidebar_title: keyring
 ---
 
 # Consul Keyring
diff --git a/website/content/commands/kv/delete.mdx b/website/content/commands/kv/delete.mdx
index 52953dc2e1..c09a1d5da7 100644
--- a/website/content/commands/kv/delete.mdx
+++ b/website/content/commands/kv/delete.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: KV Delete'
-sidebar_title: delete
 ---
 
 # Consul KV Delete
diff --git a/website/content/commands/kv/export.mdx b/website/content/commands/kv/export.mdx
index a48a736fca..52db1e6fd1 100644
--- a/website/content/commands/kv/export.mdx
+++ b/website/content/commands/kv/export.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: KV Export'
-sidebar_title: export
 ---
 
 # Consul KV Export
diff --git a/website/content/commands/kv/get.mdx b/website/content/commands/kv/get.mdx
index 288fa38e38..3cc726b7ad 100644
--- a/website/content/commands/kv/get.mdx
+++ b/website/content/commands/kv/get.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: KV Get'
-sidebar_title: get
 ---
 
 # Consul KV Get
diff --git a/website/content/commands/kv/import.mdx b/website/content/commands/kv/import.mdx
index 3e6dff10d5..ee5459e134 100644
--- a/website/content/commands/kv/import.mdx
+++ b/website/content/commands/kv/import.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: KV Import'
-sidebar_title: import
 ---
 
 # Consul KV Import
diff --git a/website/content/commands/kv/index.mdx b/website/content/commands/kv/index.mdx
index 3b5fa1742a..b3c525ff8d 100644
--- a/website/content/commands/kv/index.mdx
+++ b/website/content/commands/kv/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: KV'
-sidebar_title: kv
 ---
 
 # Consul KV
diff --git a/website/content/commands/kv/put.mdx b/website/content/commands/kv/put.mdx
index fef21e8ee4..931b9bc805 100644
--- a/website/content/commands/kv/put.mdx
+++ b/website/content/commands/kv/put.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: KV Put'
-sidebar_title: put
 ---
 
 # Consul KV Put
diff --git a/website/content/commands/leave.mdx b/website/content/commands/leave.mdx
index dd946e62c5..020c3380ef 100644
--- a/website/content/commands/leave.mdx
+++ b/website/content/commands/leave.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Leave'
-sidebar_title: leave
 description: >-
   The `leave` command triggers a graceful leave and shutdown of the agent. It is
   used to ensure other nodes see the agent as left instead of failed. Nodes that
diff --git a/website/content/commands/license.mdx b/website/content/commands/license.mdx
index eaa0cabf48..fe22a91988 100644
--- a/website/content/commands/license.mdx
+++ b/website/content/commands/license.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: License'
-sidebar_title: license
 description: >
   The license command provides datacenter-level management of the Consul
   Enterprise license.
diff --git a/website/content/commands/lock.mdx b/website/content/commands/lock.mdx
index d25b1fe9e8..389ca8d88c 100644
--- a/website/content/commands/lock.mdx
+++ b/website/content/commands/lock.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Lock'
-sidebar_title: lock
 description: >-
   The lock command provides a mechanism for leader election, mutual exclusion,
   or worker pools. For example, this can be used to ensure a maximum number of
diff --git a/website/content/commands/login.mdx b/website/content/commands/login.mdx
index 6a9804f9ad..a19cf0ec96 100644
--- a/website/content/commands/login.mdx
+++ b/website/content/commands/login.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Login'
-sidebar_title: login
 description: >
   The `login` command will exchange the provided third party credentials with
   the requested auth method for a newly minted Consul ACL token.
diff --git a/website/content/commands/logout.mdx b/website/content/commands/logout.mdx
index 4a60a938dc..ced33c583e 100644
--- a/website/content/commands/logout.mdx
+++ b/website/content/commands/logout.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Logout'
-sidebar_title: logout
 description: >
   The `logout` command will destroy the provided token if it was created from
   `consul login`.
diff --git a/website/content/commands/maint.mdx b/website/content/commands/maint.mdx
index 13a4fc6bd4..16e517e125 100644
--- a/website/content/commands/maint.mdx
+++ b/website/content/commands/maint.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Maint'
-sidebar_title: maint
 description: |
   The `maint` command provides control of both service and node maintenance mode
 ---
diff --git a/website/content/commands/members.mdx b/website/content/commands/members.mdx
index b141441462..d41e426a57 100644
--- a/website/content/commands/members.mdx
+++ b/website/content/commands/members.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Members'
-sidebar_title: members
 description: >-
   The `members` command outputs the current list of members that a Consul agent
   knows about, along with their state. The state of a node can only be alive,
diff --git a/website/content/commands/monitor.mdx b/website/content/commands/monitor.mdx
index 5d30f52ed6..51899cdc53 100644
--- a/website/content/commands/monitor.mdx
+++ b/website/content/commands/monitor.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Monitor'
-sidebar_title: monitor
 description: >-
   The `monitor` command is used to connect and follow the logs of a running
   Consul agent. Monitor will show the recent logs and then continue to follow
diff --git a/website/content/commands/namespace/create.mdx b/website/content/commands/namespace/create.mdx
index 88b6a802db..781a499e08 100644
--- a/website/content/commands/namespace/create.mdx
+++ b/website/content/commands/namespace/create.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Namespace Create'
-sidebar_title: create
 ---
 
 # Consul Namespace Create
diff --git a/website/content/commands/namespace/delete.mdx b/website/content/commands/namespace/delete.mdx
index 8102f3c39d..59b6a834b5 100644
--- a/website/content/commands/namespace/delete.mdx
+++ b/website/content/commands/namespace/delete.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Namespace Delete'
-sidebar_title: delete
 ---
 
 # Consul Namespace Delete
diff --git a/website/content/commands/namespace/index.mdx b/website/content/commands/namespace/index.mdx
index dd2f34a85f..a3938a361c 100644
--- a/website/content/commands/namespace/index.mdx
+++ b/website/content/commands/namespace/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Namespace'
-sidebar_title: namespace
 description: |
   The namespace command provides management of Consul Enterprise namespaces.
 ---
diff --git a/website/content/commands/namespace/list.mdx b/website/content/commands/namespace/list.mdx
index fbb82ac449..1486547cd1 100644
--- a/website/content/commands/namespace/list.mdx
+++ b/website/content/commands/namespace/list.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Namespace List'
-sidebar_title: list
 ---
 
 # Consul Namespace List
diff --git a/website/content/commands/namespace/read.mdx b/website/content/commands/namespace/read.mdx
index f0de955024..c4fc1ad73b 100644
--- a/website/content/commands/namespace/read.mdx
+++ b/website/content/commands/namespace/read.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Namespace Read'
-sidebar_title: read
 ---
 
 # Consul Namespace Read
diff --git a/website/content/commands/namespace/update.mdx b/website/content/commands/namespace/update.mdx
index 73187e31f6..47f1f91c83 100644
--- a/website/content/commands/namespace/update.mdx
+++ b/website/content/commands/namespace/update.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Namespace Update'
-sidebar_title: update
 ---
 
 # Consul Namespace Update
diff --git a/website/content/commands/namespace/write.mdx b/website/content/commands/namespace/write.mdx
index f2b6e5b421..51b47504db 100644
--- a/website/content/commands/namespace/write.mdx
+++ b/website/content/commands/namespace/write.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Namespace Write'
-sidebar_title: write
 ---
 
 # Consul Namespace Write
diff --git a/website/content/commands/operator/area.mdx b/website/content/commands/operator/area.mdx
index f8b137d955..590d336785 100644
--- a/website/content/commands/operator/area.mdx
+++ b/website/content/commands/operator/area.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Operator Area'
-sidebar_title: area
 description: >
   The operator area command is used to interact with Consul's network area
   subsystem.
diff --git a/website/content/commands/operator/autopilot.mdx b/website/content/commands/operator/autopilot.mdx
index b8c34d559d..a0949b9bcb 100644
--- a/website/content/commands/operator/autopilot.mdx
+++ b/website/content/commands/operator/autopilot.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Operator Autopilot'
-sidebar_title: autopilot
 description: >
   The operator autopilot subcommand is used to view and modify Consul's
   Autopilot configuration.
diff --git a/website/content/commands/operator/index.mdx b/website/content/commands/operator/index.mdx
index caefab5441..0e0b460191 100644
--- a/website/content/commands/operator/index.mdx
+++ b/website/content/commands/operator/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Operator'
-sidebar_title: operator
 description: |
   The operator command provides cluster-level tools for Consul operators.
 ---
diff --git a/website/content/commands/operator/raft.mdx b/website/content/commands/operator/raft.mdx
index 725b19abe2..5d8db1fc50 100644
--- a/website/content/commands/operator/raft.mdx
+++ b/website/content/commands/operator/raft.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Operator Raft'
-sidebar_title: raft
 description: >
   The operator raft subcommand is used to view and modify Consul's Raft
   configuration.
diff --git a/website/content/commands/reload.mdx b/website/content/commands/reload.mdx
index ddd036d427..930dc87467 100644
--- a/website/content/commands/reload.mdx
+++ b/website/content/commands/reload.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Reload'
-sidebar_title: reload
 description: The `reload` command triggers a reload of configuration files for the agent.
 ---
 
diff --git a/website/content/commands/rtt.mdx b/website/content/commands/rtt.mdx
index e990658d16..49294bb2bf 100644
--- a/website/content/commands/rtt.mdx
+++ b/website/content/commands/rtt.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: RTT'
-sidebar_title: rtt
 description: |
   The rtt command estimates the network round trip time between two nodes.
 ---
diff --git a/website/content/commands/services/deregister.mdx b/website/content/commands/services/deregister.mdx
index bc476749e6..6a50522c2a 100644
--- a/website/content/commands/services/deregister.mdx
+++ b/website/content/commands/services/deregister.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Services Deregister'
-sidebar_title: deregister
 ---
 
 # Consul Agent Service Deregistration
diff --git a/website/content/commands/services/index.mdx b/website/content/commands/services/index.mdx
index e33513387b..5998e36acc 100644
--- a/website/content/commands/services/index.mdx
+++ b/website/content/commands/services/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Services'
-sidebar_title: services
 ---
 
 # Consul Agent Services
diff --git a/website/content/commands/services/register.mdx b/website/content/commands/services/register.mdx
index f626bda297..effd8b4141 100644
--- a/website/content/commands/services/register.mdx
+++ b/website/content/commands/services/register.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Services Register'
-sidebar_title: register
 ---
 
 # Consul Agent Service Registration
diff --git a/website/content/commands/snapshot/agent.mdx b/website/content/commands/snapshot/agent.mdx
index 3ee1d20a00..5691e095ac 100644
--- a/website/content/commands/snapshot/agent.mdx
+++ b/website/content/commands/snapshot/agent.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Snapshot Agent'
-sidebar_title: agent
 ---
 
 # Consul Snapshot Agent
diff --git a/website/content/commands/snapshot/index.mdx b/website/content/commands/snapshot/index.mdx
index 1967375d2a..6892b07e30 100644
--- a/website/content/commands/snapshot/index.mdx
+++ b/website/content/commands/snapshot/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Snapshot'
-sidebar_title: snapshot
 ---
 
 # Consul Snapshot
diff --git a/website/content/commands/snapshot/inspect.mdx b/website/content/commands/snapshot/inspect.mdx
index fa08763b85..6486bec7ec 100644
--- a/website/content/commands/snapshot/inspect.mdx
+++ b/website/content/commands/snapshot/inspect.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Snapshot Inspect'
-sidebar_title: inspect
 ---
 
 # Consul Snapshot Inspect
diff --git a/website/content/commands/snapshot/restore.mdx b/website/content/commands/snapshot/restore.mdx
index 8bdae7041f..89e4ba3942 100644
--- a/website/content/commands/snapshot/restore.mdx
+++ b/website/content/commands/snapshot/restore.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Snapshot Restore'
-sidebar_title: restore
 ---
 
 # Consul Snapshot Restore
diff --git a/website/content/commands/snapshot/save.mdx b/website/content/commands/snapshot/save.mdx
index 8ea8e90066..ecb3557358 100644
--- a/website/content/commands/snapshot/save.mdx
+++ b/website/content/commands/snapshot/save.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Snapshot Save'
-sidebar_title: save
 ---
 
 # Consul Snapshot Save
diff --git a/website/content/commands/tls/ca.mdx b/website/content/commands/tls/ca.mdx
index 4f7bb842ae..c6531e3c0f 100644
--- a/website/content/commands/tls/ca.mdx
+++ b/website/content/commands/tls/ca.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: TLS CA Create'
-sidebar_title: ca
 ---
 
 # Consul TLS CA Create
diff --git a/website/content/commands/tls/cert.mdx b/website/content/commands/tls/cert.mdx
index 328f0616fb..097de83bb7 100644
--- a/website/content/commands/tls/cert.mdx
+++ b/website/content/commands/tls/cert.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: TLS Cert Create'
-sidebar_title: cert
 ---
 
 # Consul TLS Cert Create
diff --git a/website/content/commands/tls/index.mdx b/website/content/commands/tls/index.mdx
index d696988776..47494fa0fc 100644
--- a/website/content/commands/tls/index.mdx
+++ b/website/content/commands/tls/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: TLS'
-sidebar_title: tls
 ---
 
 # Consul TLS
diff --git a/website/content/commands/validate.mdx b/website/content/commands/validate.mdx
index 03ef8c530a..cb3d02e079 100644
--- a/website/content/commands/validate.mdx
+++ b/website/content/commands/validate.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Validate'
-sidebar_title: validate
 description: >
   The `consul validate` command tests that config files are valid by attempting
   to parse them. Useful to ensure a configuration change will not cause consul
diff --git a/website/content/commands/version.mdx b/website/content/commands/version.mdx
index c50f6bc5ea..fb34625362 100644
--- a/website/content/commands/version.mdx
+++ b/website/content/commands/version.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Version'
-sidebar_title: version
 description: >-
   The `version` command prints the version of Consul and the protocol versions
   it understands for speaking to other agents.
diff --git a/website/content/commands/watch.mdx b/website/content/commands/watch.mdx
index 40312048fb..0aa8845175 100644
--- a/website/content/commands/watch.mdx
+++ b/website/content/commands/watch.mdx
@@ -1,7 +1,6 @@
 ---
 layout: commands
 page_title: 'Commands: Watch'
-sidebar_title: watch
 description: >-
   The `watch` command provides a mechanism to watch for changes in a particular
   data view (list of nodes, service members, key value, etc) and to invoke a
diff --git a/website/content/docs/agent/config-entries.mdx b/website/content/docs/agent/config-entries.mdx
index 4eb467ae70..000a2db7f0 100644
--- a/website/content/docs/agent/config-entries.mdx
+++ b/website/content/docs/agent/config-entries.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Configuration Entries
-sidebar_title: Configuration Entries
 description: >-
   Consul allows storing configuration entries centrally to be used as defaults
   for configuring other aspects of Consul.
diff --git a/website/content/docs/agent/index.mdx b/website/content/docs/agent/index.mdx
index d7e153c72b..d971d4a33f 100644
--- a/website/content/docs/agent/index.mdx
+++ b/website/content/docs/agent/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Agent
-sidebar_title: Agent
 description: >-
   The Consul agent is the core process of Consul. The agent maintains membership
   information, registers services, runs checks, responds to queries, and more.
diff --git a/website/content/docs/agent/options.mdx b/website/content/docs/agent/options.mdx
index be45cdce87..9fe7044703 100644
--- a/website/content/docs/agent/options.mdx
+++ b/website/content/docs/agent/options.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Configuration
-sidebar_title: Configuration
 description: >-
   The agent has various configuration options that can be specified via the
   command-line or via configuration files. All of the configuration options are
diff --git a/website/content/docs/agent/sentinel.mdx b/website/content/docs/agent/sentinel.mdx
index d643ae459c..29b8f9b93d 100644
--- a/website/content/docs/agent/sentinel.mdx
+++ b/website/content/docs/agent/sentinel.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Sentinel in Consul
-sidebar_title: Sentinel
 description: >-
   Consul Enterprise uses Sentinel to augment the built-in ACL system to provide
   advanced policy enforcement. Sentinel policies can currently execute on KV
diff --git a/website/content/docs/agent/telemetry.mdx b/website/content/docs/agent/telemetry.mdx
index f1314fd01c..139acd68b8 100644
--- a/website/content/docs/agent/telemetry.mdx
+++ b/website/content/docs/agent/telemetry.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Telemetry
-sidebar_title: Telemetry
 description: >-
   The Consul agent collects various runtime metrics about the performance of
   different libraries and subsystems. These metrics are aggregated on a ten
diff --git a/website/content/docs/architecture/anti-entropy.mdx b/website/content/docs/architecture/anti-entropy.mdx
index 5d99ede902..ca9c1c5017 100644
--- a/website/content/docs/architecture/anti-entropy.mdx
+++ b/website/content/docs/architecture/anti-entropy.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Anti-Entropy
-sidebar_title: Anti-Entropy
 description: |
   This section details the process and use of anti-entropy in Consul.
 ---
diff --git a/website/content/docs/architecture/consensus.mdx b/website/content/docs/architecture/consensus.mdx
index 0059406cfc..9a172a54b7 100644
--- a/website/content/docs/architecture/consensus.mdx
+++ b/website/content/docs/architecture/consensus.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consensus Protocol
-sidebar_title: Consensus Protocol
 description: >-
   Consul uses a consensus protocol to provide Consistency as defined by CAP. The
   consensus protocol is based on Raft: In search of an Understandable Consensus
diff --git a/website/content/docs/architecture/coordinates.mdx b/website/content/docs/architecture/coordinates.mdx
index eed59fff8e..60c9d3d29a 100644
--- a/website/content/docs/architecture/coordinates.mdx
+++ b/website/content/docs/architecture/coordinates.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Network Coordinates
-sidebar_title: Network Coordinates
 description: A Decentralized Network Coordinate System, with several improvements based on several follow-on papers.
 ---
 
diff --git a/website/content/docs/architecture/gossip.mdx b/website/content/docs/architecture/gossip.mdx
index bfbbab47af..21f0e5262b 100644
--- a/website/content/docs/architecture/gossip.mdx
+++ b/website/content/docs/architecture/gossip.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Gossip Protocol
-sidebar_title: Gossip Protocol
 description: >-
   Consul uses a gossip protocol to manage membership and broadcast messages to
   the cluster. All of this is provided through the use of the Serf library. The
diff --git a/website/content/docs/architecture/index.mdx b/website/content/docs/architecture/index.mdx
index 0d52a63714..f722a40b92 100644
--- a/website/content/docs/architecture/index.mdx
+++ b/website/content/docs/architecture/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Architecture
-sidebar_title: Architecture
 description: >-
   Consul is a complex system that has many different moving parts. To help users
   and developers of Consul form a mental model of how it works, this page
diff --git a/website/content/docs/architecture/jepsen.mdx b/website/content/docs/architecture/jepsen.mdx
index a72619bd0e..77f3a29fdd 100644
--- a/website/content/docs/architecture/jepsen.mdx
+++ b/website/content/docs/architecture/jepsen.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Jepsen Testing
-sidebar_title: Jepsen Testing
 description: >-
   Jepsen is a tool, written by Kyle Kingsbury, designed to test the partition
   tolerance of distributed systems. It creates network partitions while fuzzing
diff --git a/website/content/docs/connect/ca/aws.mdx b/website/content/docs/connect/ca/aws.mdx
index bcfa5b4cef..77eca45875 100644
--- a/website/content/docs/connect/ca/aws.mdx
+++ b/website/content/docs/connect/ca/aws.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Certificate Management
-sidebar_title: ACM Private CA
 description: >-
   Consul can be used with AWS Certificate Manager Private CA to manage and sign
   certificates.
diff --git a/website/content/docs/connect/ca/consul.mdx b/website/content/docs/connect/ca/consul.mdx
index ebc3e7f29b..a07629fb06 100644
--- a/website/content/docs/connect/ca/consul.mdx
+++ b/website/content/docs/connect/ca/consul.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Certificate Management
-sidebar_title: Built-In CA
 description: >-
   Consul ships with a built-in CA system so that Connect can be easily enabled
   out of the box. The built-in CA generates and stores the root certificate and
diff --git a/website/content/docs/connect/ca/index.mdx b/website/content/docs/connect/ca/index.mdx
index 394ad329a4..74e6cb3704 100644
--- a/website/content/docs/connect/ca/index.mdx
+++ b/website/content/docs/connect/ca/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Certificate Management
-sidebar_title: Certificate Management
 description: An overview of the Connect Certificate Authority mechanisms.
 ---
 
diff --git a/website/content/docs/connect/ca/vault.mdx b/website/content/docs/connect/ca/vault.mdx
index 7150e6885c..3057b706f7 100644
--- a/website/content/docs/connect/ca/vault.mdx
+++ b/website/content/docs/connect/ca/vault.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Certificate Management
-sidebar_title: Vault
 description: >-
   Consul can be used with Vault to manage and sign certificates. The Vault CA
   provider uses the Vault PKI secrets engine to generate and sign certificates.
diff --git a/website/content/docs/connect/config-entries/index.mdx b/website/content/docs/connect/config-entries/index.mdx
index c9682c11cc..18657d80ad 100644
--- a/website/content/docs/connect/config-entries/index.mdx
+++ b/website/content/docs/connect/config-entries/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Configuration Entry Definitions
-sidebar_title: Configuration Entries
 description: >-
   Consul allows storing configuration entries centrally to be used as defaults
   for configuring other aspects of Consul.
diff --git a/website/content/docs/connect/config-entries/ingress-gateway.mdx b/website/content/docs/connect/config-entries/ingress-gateway.mdx
index 1d6047666d..a62e962375 100644
--- a/website/content/docs/connect/config-entries/ingress-gateway.mdx
+++ b/website/content/docs/connect/config-entries/ingress-gateway.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Configuration Entry Kind: Ingress Gateway'
-sidebar_title: Ingress Gateway
 description: >-
   The `ingress-gateway` config entry kind allows for configuring Ingress gateways
   with listeners that expose a set of services outside the Consul service mesh.
diff --git a/website/content/docs/connect/config-entries/proxy-defaults.mdx b/website/content/docs/connect/config-entries/proxy-defaults.mdx
index e829a9d893..1b5ebbd432 100644
--- a/website/content/docs/connect/config-entries/proxy-defaults.mdx
+++ b/website/content/docs/connect/config-entries/proxy-defaults.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Configuration Entry Kind: Proxy Defaults'
-sidebar_title: Proxy Defaults
 description: >-
   The proxy-defaults config entry kind allows for configuring global config
   defaults across all services for Connect proxy configuration. Currently, only
diff --git a/website/content/docs/connect/config-entries/service-defaults.mdx b/website/content/docs/connect/config-entries/service-defaults.mdx
index cea6158f32..b7121c7797 100644
--- a/website/content/docs/connect/config-entries/service-defaults.mdx
+++ b/website/content/docs/connect/config-entries/service-defaults.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Configuration Entry Kind: Service Defaults'
-sidebar_title: Service Defaults
 description: >-
   The service-defaults config entry kind controls default global values for a
   service, such as its protocol.
diff --git a/website/content/docs/connect/config-entries/service-intentions.mdx b/website/content/docs/connect/config-entries/service-intentions.mdx
index e510ada8bc..926720079f 100644
--- a/website/content/docs/connect/config-entries/service-intentions.mdx
+++ b/website/content/docs/connect/config-entries/service-intentions.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Configuration Entry Kind: Service Intentions'
-sidebar_title: Service Intentions
 description: >-
   The service-intentions config entry kind controls Connect traffic
   authorization for both networking layer 4 (e.g. TCP) and networking layer 7
diff --git a/website/content/docs/connect/config-entries/service-resolver.mdx b/website/content/docs/connect/config-entries/service-resolver.mdx
index 43f8d53365..151e6093af 100644
--- a/website/content/docs/connect/config-entries/service-resolver.mdx
+++ b/website/content/docs/connect/config-entries/service-resolver.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Configuration Entry Kind: Service Resolver'
-sidebar_title: Service Resolver
 description: >-
   The `service-resolver` config entry kind controls which service instances
   should satisfy Connect upstream discovery requests for a given service name.
diff --git a/website/content/docs/connect/config-entries/service-router.mdx b/website/content/docs/connect/config-entries/service-router.mdx
index facd1db25f..367d546aa7 100644
--- a/website/content/docs/connect/config-entries/service-router.mdx
+++ b/website/content/docs/connect/config-entries/service-router.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Configuration Entry Kind: Service Router'
-sidebar_title: Service Router
 description: >-
   The service-router config entry kind controls Connect traffic routing and
   manipulation at networking layer 7 (e.g. HTTP).
diff --git a/website/content/docs/connect/config-entries/service-splitter.mdx b/website/content/docs/connect/config-entries/service-splitter.mdx
index d65aa35dac..617a8ada14 100644
--- a/website/content/docs/connect/config-entries/service-splitter.mdx
+++ b/website/content/docs/connect/config-entries/service-splitter.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Configuration Entry Kind: Service Splitter'
-sidebar_title: Service Splitter
 description: >-
   The service-splitter config entry kind controls how to split incoming Connect
   requests across different subsets of a single service (like during staged
diff --git a/website/content/docs/connect/config-entries/terminating-gateway.mdx b/website/content/docs/connect/config-entries/terminating-gateway.mdx
index 9acab3c0ff..3f60fbc140 100644
--- a/website/content/docs/connect/config-entries/terminating-gateway.mdx
+++ b/website/content/docs/connect/config-entries/terminating-gateway.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Configuration Entry Kind: Terminating Gateway'
-sidebar_title: Terminating Gateway
 description: >-
   The `terminating-gateway` config entry kind allows for configuring terminating gateways
   to proxy traffic from services in the Consul service mesh to services outside the mesh.
diff --git a/website/content/docs/connect/configuration.mdx b/website/content/docs/connect/configuration.mdx
index 104bdb9539..a60ddf78f1 100644
--- a/website/content/docs/connect/configuration.mdx
+++ b/website/content/docs/connect/configuration.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Configuration
-sidebar_title: Configuration
 description: >-
   A Connect-aware proxy enables unmodified applications to use Connect. A
   per-service proxy sidecar transparently handles inbound and outbound service
diff --git a/website/content/docs/connect/connect-internals.mdx b/website/content/docs/connect/connect-internals.mdx
index 40b8b1bf61..c55ab29423 100644
--- a/website/content/docs/connect/connect-internals.mdx
+++ b/website/content/docs/connect/connect-internals.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: How Connect Works
-sidebar_title: How Connect Works
 description: >-
   This page details the internals of Consul Connect: mutual TLS, agent caching
   and performance, intention and certificate authority replication.
diff --git a/website/content/docs/connect/connectivity-tasks.mdx b/website/content/docs/connect/connectivity-tasks.mdx
index b7f8a81876..aa9318e6ed 100644
--- a/website/content/docs/connect/connectivity-tasks.mdx
+++ b/website/content/docs/connect/connectivity-tasks.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connectivity Tasks
-sidebar_title: Connectivity Tasks
 description: >-
   Tasks related to connectivity into, out of, and between Consul service meshes.
 ---
diff --git a/website/content/docs/connect/dev.mdx b/website/content/docs/connect/dev.mdx
index 2d9909c036..55b91b6f41 100644
--- a/website/content/docs/connect/dev.mdx
+++ b/website/content/docs/connect/dev.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Development and Debugging
-sidebar_title: Develop and Debug
 description: >-
   It is often necessary to connect to a service for development or debugging. If
   a service only exposes a Connect listener, then we need a way to establish a
diff --git a/website/content/docs/connect/gateways/index.mdx b/website/content/docs/connect/gateways/index.mdx
index 3e15709a75..31fdb4f106 100644
--- a/website/content/docs/connect/gateways/index.mdx
+++ b/website/content/docs/connect/gateways/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Gateways
-sidebar_title: Gateways
 description: >-
   Gateways provide connectivity into, out of, and between Consul service meshes.
 ---
diff --git a/website/content/docs/connect/gateways/ingress-gateway.mdx b/website/content/docs/connect/gateways/ingress-gateway.mdx
index a712a74b1f..ec969d9a63 100644
--- a/website/content/docs/connect/gateways/ingress-gateway.mdx
+++ b/website/content/docs/connect/gateways/ingress-gateway.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: External <> Internal Services -  Ingress Gateways
-sidebar_title: External <> Internal Services -  Ingress Gateways
 description: >-
   An ingress gateway enables ingress traffic from services outside the Consul
   service mesh to services inside the Consul service mesh. This section details
diff --git a/website/content/docs/connect/gateways/mesh-gateway/index.mdx b/website/content/docs/connect/gateways/mesh-gateway/index.mdx
index 31adb027da..2622a06760 100644
--- a/website/content/docs/connect/gateways/mesh-gateway/index.mdx
+++ b/website/content/docs/connect/gateways/mesh-gateway/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect Datacenters - Mesh Gateways
-sidebar_title: Connect Datacenters - Mesh Gateways
 description: >-
   A Mesh Gateway enables better routing of a Connect service's data to upstreams
   in other datacenters. This section details how to use Envoy and describes how
diff --git a/website/content/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways.mdx b/website/content/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways.mdx
index e8d726ae6c..e892c81622 100644
--- a/website/content/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways.mdx
+++ b/website/content/docs/connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: WAN Federation via Mesh Gateways
-sidebar_title: WAN Federation
 description: |-
   WAN federation via mesh gateways allows for Consul servers in different datacenters to be federated exclusively through mesh gateways.
 ---
diff --git a/website/content/docs/connect/gateways/terminating-gateway.mdx b/website/content/docs/connect/gateways/terminating-gateway.mdx
index b08c62eaea..fe5c700e79 100644
--- a/website/content/docs/connect/gateways/terminating-gateway.mdx
+++ b/website/content/docs/connect/gateways/terminating-gateway.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Internal <> External Services - Terminating Gateways
-sidebar_title: Internal <> External Services - Terminating Gateways
 description: >-
   A terminating gateway enables traffic from services in the Consul
   service mesh to services outside the mesh. This section details
diff --git a/website/content/docs/connect/index.mdx b/website/content/docs/connect/index.mdx
index b8abf9f3cd..ed27dbf82b 100644
--- a/website/content/docs/connect/index.mdx
+++ b/website/content/docs/connect/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Service Mesh
-sidebar_title: Service Mesh
 description: |-
   Consul Connect provides service-to-service connection authorization and
   encryption using mutual TLS.
diff --git a/website/content/docs/connect/intentions-legacy.mdx b/website/content/docs/connect/intentions-legacy.mdx
index 8d8d84c4e4..240f0aea83 100644
--- a/website/content/docs/connect/intentions-legacy.mdx
+++ b/website/content/docs/connect/intentions-legacy.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Service-to-service permissions - Intentions (Legacy Mode)
-sidebar_title: Service-to-service permissions - Intentions (Legacy Mode)
 description: >-
   Intentions define access control for services via Connect and are used to
   control which services may establish connections. Intentions can be managed
diff --git a/website/content/docs/connect/intentions.mdx b/website/content/docs/connect/intentions.mdx
index 2e27273c15..267953b0da 100644
--- a/website/content/docs/connect/intentions.mdx
+++ b/website/content/docs/connect/intentions.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Service-to-service permissions - Intentions
-sidebar_title: Service-to-service permissions - Intentions
 description: >-
   Intentions define access control for services via Connect and are used to
   control which services may establish connections or make requests.
diff --git a/website/content/docs/connect/l7-traffic/discovery-chain.mdx b/website/content/docs/connect/l7-traffic/discovery-chain.mdx
index e1beff31bd..993e776b65 100644
--- a/website/content/docs/connect/l7-traffic/discovery-chain.mdx
+++ b/website/content/docs/connect/l7-traffic/discovery-chain.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Discovery Chain
-sidebar_title: Discovery Chain
 description: >-
   The service discovery process can be modeled as a "discovery chain" which
   passes through three distinct stages: routing, splitting, and resolution. Each
diff --git a/website/content/docs/connect/l7-traffic/index.mdx b/website/content/docs/connect/l7-traffic/index.mdx
index 0d068047be..22248cdadc 100644
--- a/website/content/docs/connect/l7-traffic/index.mdx
+++ b/website/content/docs/connect/l7-traffic/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - L7 Traffic Management
-sidebar_title: L7 Traffic Management
 description: >-
   Layer 7 traffic management allows operators to divide L7 traffic between
   different subsets of service instances when using Connect.
diff --git a/website/content/docs/connect/native/go.mdx b/website/content/docs/connect/native/go.mdx
index ecbf6d6555..50d9286e17 100644
--- a/website/content/docs/connect/native/go.mdx
+++ b/website/content/docs/connect/native/go.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Native Application Integration - Go
-sidebar_title: Go Integration
 description: >-
   We provide a library that makes it drop-in simple to integrate Connect with
   most Go applications. For most Go applications, Connect can be natively
diff --git a/website/content/docs/connect/native/index.mdx b/website/content/docs/connect/native/index.mdx
index 5b0f0e0497..53dd514e42 100644
--- a/website/content/docs/connect/native/index.mdx
+++ b/website/content/docs/connect/native/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Native Application Integration
-sidebar_title: Native App Integration
 description: >-
   Applications can natively integrate with the Connect API to support accepting
   and establishing connections to other Connect services without the overhead of
diff --git a/website/content/docs/connect/nomad.mdx b/website/content/docs/connect/nomad.mdx
index 922d90596d..e5ac1e7aa2 100644
--- a/website/content/docs/connect/nomad.mdx
+++ b/website/content/docs/connect/nomad.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Nomad
-sidebar_title: Nomad
 description: >-
   Connect can be used with [Nomad](https://www.nomadproject.io) to provide
   secure service-to-service communication between Nomad jobs. The ability to use
diff --git a/website/content/docs/connect/observability/index.mdx b/website/content/docs/connect/observability/index.mdx
index 1ba9c16850..dda5e782e3 100644
--- a/website/content/docs/connect/observability/index.mdx
+++ b/website/content/docs/connect/observability/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Observability
-sidebar_title: Observability
 description: |-
   This page documents the configurations necessary for L7 observability using
   Consul Connect.
diff --git a/website/content/docs/connect/observability/ui-visualization.mdx b/website/content/docs/connect/observability/ui-visualization.mdx
index fcd2ff46e2..2c66527bc7 100644
--- a/website/content/docs/connect/observability/ui-visualization.mdx
+++ b/website/content/docs/connect/observability/ui-visualization.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - UI Visualization
-sidebar_title: UI Visualization
 description: |-
   This page describes how to set up and customize the Service Mesh Topology
   visualization in Consul's UI.
diff --git a/website/content/docs/connect/proxies/built-in.mdx b/website/content/docs/connect/proxies/built-in.mdx
index 730b6dd6da..edba97692c 100644
--- a/website/content/docs/connect/proxies/built-in.mdx
+++ b/website/content/docs/connect/proxies/built-in.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Built-in Proxy
-sidebar_title: Built-in Proxy
 description: Consul Connect comes with a built-in proxy for testing and development.
 ---
 
diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
index 45c1b1aa94..6369ac566b 100644
--- a/website/content/docs/connect/proxies/envoy.mdx
+++ b/website/content/docs/connect/proxies/envoy.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Envoy Integration
-sidebar_title: Envoy
 description: Consul Connect has first-class support for configuring Envoy proxy.
 ---
 
diff --git a/website/content/docs/connect/proxies/index.mdx b/website/content/docs/connect/proxies/index.mdx
index 874871fe8b..14865aeb9a 100644
--- a/website/content/docs/connect/proxies/index.mdx
+++ b/website/content/docs/connect/proxies/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Proxies
-sidebar_title: Supported Proxies
 description: >-
   A Connect-aware proxy enables unmodified applications to use Connect. This
   section details how to use either Envoy or Consul's built-in L4 proxy, and
diff --git a/website/content/docs/connect/proxies/integrate.mdx b/website/content/docs/connect/proxies/integrate.mdx
index 8fd08d3cf5..e9b9b8af6e 100644
--- a/website/content/docs/connect/proxies/integrate.mdx
+++ b/website/content/docs/connect/proxies/integrate.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Proxy Integration
-sidebar_title: Proxy Integration
 description: >-
   A Connect-aware proxy enables unmodified applications to use Connect. A
   per-service proxy sidecar transparently handles inbound and outbound service
diff --git a/website/content/docs/connect/registration/index.mdx b/website/content/docs/connect/registration/index.mdx
index 433b25a5b5..58cf1666b0 100644
--- a/website/content/docs/connect/registration/index.mdx
+++ b/website/content/docs/connect/registration/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Proxy Registration
-sidebar_title: Registering Proxies
 description: >-
   To make connect aware of proxies you will need to register them as Consul
   services. This section describes the process and options for proxy
diff --git a/website/content/docs/connect/registration/service-registration.mdx b/website/content/docs/connect/registration/service-registration.mdx
index ba71cdf27d..728a853f37 100644
--- a/website/content/docs/connect/registration/service-registration.mdx
+++ b/website/content/docs/connect/registration/service-registration.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Service Registration
-sidebar_title: Proxy Service Registration
 description: >-
   A per-service proxy sidecar transparently handles inbound and outbound service
   connections. You can register these sidecars with sane defaults by nesting
diff --git a/website/content/docs/connect/registration/sidecar-service.mdx b/website/content/docs/connect/registration/sidecar-service.mdx
index ad791d9536..88bf58d62f 100644
--- a/website/content/docs/connect/registration/sidecar-service.mdx
+++ b/website/content/docs/connect/registration/sidecar-service.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Sidecar Service Registration
-sidebar_title: Sidecar Service Registration
 description: |-
   Sidecar service registrations provide a convenient shorthand for registering a
   sidecar proxy inline with a regular service definition.
diff --git a/website/content/docs/connect/security.mdx b/website/content/docs/connect/security.mdx
index a92d8b060a..685160c0da 100644
--- a/website/content/docs/connect/security.mdx
+++ b/website/content/docs/connect/security.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Connect - Security
-sidebar_title: Securing Connect
 description: |-
   Connect enables secure service-to-service communication over mutual TLS. This
   provides both in-transit data encryption as well as authorization. This page
diff --git a/website/content/docs/discovery/checks.mdx b/website/content/docs/discovery/checks.mdx
index a8b05851e8..83dedf5e05 100644
--- a/website/content/docs/discovery/checks.mdx
+++ b/website/content/docs/discovery/checks.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Monitor Services - Check Definitions
-sidebar_title: Monitor Services - Check Definitions
 description: >-
   One of the primary roles of the agent is management of system- and
   application-level health checks. A health check is considered to be
diff --git a/website/content/docs/discovery/dns.mdx b/website/content/docs/discovery/dns.mdx
index 08759d78f6..6f737b9532 100644
--- a/website/content/docs/discovery/dns.mdx
+++ b/website/content/docs/discovery/dns.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Find Services - DNS Interface
-sidebar_title: Find Services - DNS Interface
 description: >-
   One of the primary query interfaces for Consul is DNS. The DNS interface
   allows applications to make use of service discovery without any high-touch
diff --git a/website/content/docs/discovery/services.mdx b/website/content/docs/discovery/services.mdx
index c1d01f5f2c..79266c0dab 100644
--- a/website/content/docs/discovery/services.mdx
+++ b/website/content/docs/discovery/services.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Register Services - Service Definitions
-sidebar_title: Register Services - Service Definitions
 description: >-
   One of the main goals of service discovery is to provide a catalog of
   available services. To that end, the agent provides a simple service
diff --git a/website/content/docs/download-tools.mdx b/website/content/docs/download-tools.mdx
index 4d4ab57b8a..c6c9db0f1f 100644
--- a/website/content/docs/download-tools.mdx
+++ b/website/content/docs/download-tools.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Tools
-sidebar_title: Consul Tools
 description: |-
   From this page you can download various tools for Consul. These tools are
   maintained by HashiCorp and the Consul Community.
diff --git a/website/content/docs/dynamic-app-config/kv.mdx b/website/content/docs/dynamic-app-config/kv.mdx
index f9d3527037..1ee36f31e7 100644
--- a/website/content/docs/dynamic-app-config/kv.mdx
+++ b/website/content/docs/dynamic-app-config/kv.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul KV
-sidebar_title: Consul KV
 description: Consul KV is a core feature of Consul and is installed with the Consul agent.
 ---
 
diff --git a/website/content/docs/dynamic-app-config/sessions.mdx b/website/content/docs/dynamic-app-config/sessions.mdx
index db5b464f17..b7715289eb 100644
--- a/website/content/docs/dynamic-app-config/sessions.mdx
+++ b/website/content/docs/dynamic-app-config/sessions.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Sessions
-sidebar_title: Sessions
 description: >-
   Consul provides a session mechanism which can be used to build distributed
   locks. Sessions act as a binding layer between nodes, health checks, and
diff --git a/website/content/docs/dynamic-app-config/watches.mdx b/website/content/docs/dynamic-app-config/watches.mdx
index fb2898c98b..560f04fc2f 100644
--- a/website/content/docs/dynamic-app-config/watches.mdx
+++ b/website/content/docs/dynamic-app-config/watches.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Watches
-sidebar_title: Watches
 description: >-
   Watches are a way of specifying a view of data (e.g. list of nodes, KV pairs,
   health checks) which is monitored for updates. When an update is detected, an
diff --git a/website/content/docs/enterprise/audit-logging.mdx b/website/content/docs/enterprise/audit-logging.mdx
index db3f0752b6..7702125550 100644
--- a/website/content/docs/enterprise/audit-logging.mdx
+++ b/website/content/docs/enterprise/audit-logging.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Enterprise Audit Logging
-sidebar_title: Audit Logging
 description: >-
   Consul Enterprise provides the ability to write events of user behavior with Consul’s API so operations and security users can perform legal compliance auditing.
 ---
diff --git a/website/content/docs/enterprise/backups.mdx b/website/content/docs/enterprise/backups.mdx
index fa264e1d9d..a6724fe787 100644
--- a/website/content/docs/enterprise/backups.mdx
+++ b/website/content/docs/enterprise/backups.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Enterprise Automated Backups
-sidebar_title: Automated Backups
 description: >-
   Consul Enterprise provides a highly available service that manages taking
   snapshots, rotation and sending backup files offsite to Amazon S3 (or
diff --git a/website/content/docs/enterprise/federation.mdx b/website/content/docs/enterprise/federation.mdx
index ed338b4242..9c00e6471a 100644
--- a/website/content/docs/enterprise/federation.mdx
+++ b/website/content/docs/enterprise/federation.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Enterprise Advanced Federation
-sidebar_title: Advanced Federation
 description: >-
   Consul Enterprise enables you to federate Consul datacenters together on a
   pairwise basis, enabling partially-connected network topologies like
diff --git a/website/content/docs/enterprise/index.mdx b/website/content/docs/enterprise/index.mdx
index f3c15c6702..dc1d54ac74 100644
--- a/website/content/docs/enterprise/index.mdx
+++ b/website/content/docs/enterprise/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Enterprise Features
-sidebar_title: Enterprise Features
 description: >-
   Consul Enterprise features a number of capabilities beyond the open source
   offering that may be beneficial in certain workflows.
diff --git a/website/content/docs/enterprise/namespaces.mdx b/website/content/docs/enterprise/namespaces.mdx
index 770f88d7fd..b6a7d4a507 100644
--- a/website/content/docs/enterprise/namespaces.mdx
+++ b/website/content/docs/enterprise/namespaces.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Enterprise Namespaces
-sidebar_title: Namespaces
 description: Consul Enterprise enables data isolation with Namespaces.
 ---
 
diff --git a/website/content/docs/enterprise/network-segments.mdx b/website/content/docs/enterprise/network-segments.mdx
index 6c9bfd2cfa..f46e5e319a 100644
--- a/website/content/docs/enterprise/network-segments.mdx
+++ b/website/content/docs/enterprise/network-segments.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Enterprise Network Segments
-sidebar_title: Network Segments
 description: |-
   Consul Enterprise enables you create separate LAN gossip pools within one
   cluster to segment network groups.
diff --git a/website/content/docs/enterprise/read-scale.mdx b/website/content/docs/enterprise/read-scale.mdx
index cf2dd536fa..65faf68f97 100644
--- a/website/content/docs/enterprise/read-scale.mdx
+++ b/website/content/docs/enterprise/read-scale.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Enterprise Enhanced Read Scalability
-sidebar_title: Enhanced Read Scalability
 description: >-
   Consul Enterprise supports increased read scalability without impacting write
   latency by introducing read replicas.
diff --git a/website/content/docs/enterprise/redundancy.mdx b/website/content/docs/enterprise/redundancy.mdx
index e8f611c561..73c0ced82f 100644
--- a/website/content/docs/enterprise/redundancy.mdx
+++ b/website/content/docs/enterprise/redundancy.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Enterprise Redundancy Zones
-sidebar_title: Redundancy Zones
 description: >-
   Consul Enterprise redundancy zones enable hot standby servers on a per
   availability zone basis.
diff --git a/website/content/docs/enterprise/sentinel.mdx b/website/content/docs/enterprise/sentinel.mdx
index a69cd48fc8..5e20f7af5e 100644
--- a/website/content/docs/enterprise/sentinel.mdx
+++ b/website/content/docs/enterprise/sentinel.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Sentinel in Consul
-sidebar_title: Sentinel
 description: >-
   Consul Enterprise uses Sentinel to augment the built-in ACL system to provide
   advanced policy enforcement. Sentinel policies can currently execute on KV
diff --git a/website/content/docs/enterprise/upgrades.mdx b/website/content/docs/enterprise/upgrades.mdx
index 9ea447ce9a..20b18d725e 100644
--- a/website/content/docs/enterprise/upgrades.mdx
+++ b/website/content/docs/enterprise/upgrades.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Enterprise Automated Upgrades
-sidebar_title: Automated Upgrades
 description: >-
   Consul Enterprise supports an upgrade pattern that allows operators to deploy
   a complete cluster of new servers and then just wait for the upgrade to
diff --git a/website/content/docs/guides/index.mdx b/website/content/docs/guides/index.mdx
index d1b57740a4..b3d68af992 100644
--- a/website/content/docs/guides/index.mdx
+++ b/website/content/docs/guides/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Guides
-sidebar_title: Guides
 description: |-
   This section provides various guides for common actions. Due to the nature of
   Consul, some of these procedures can be complex, so our goal is to provide
diff --git a/website/content/docs/install/bootstrapping.mdx b/website/content/docs/install/bootstrapping.mdx
index a313811c7a..749bf2c7a8 100644
--- a/website/content/docs/install/bootstrapping.mdx
+++ b/website/content/docs/install/bootstrapping.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Bootstrapping a Datacenter
-sidebar_title: Bootstrapping a Datacenter
 description: >-
   An agent can run in both client and server mode. Server nodes are responsible
   for running the consensus protocol and storing the cluster state. Before a
diff --git a/website/content/docs/install/cloud-auto-join.mdx b/website/content/docs/install/cloud-auto-join.mdx
index 7a16201515..259cb7714b 100644
--- a/website/content/docs/install/cloud-auto-join.mdx
+++ b/website/content/docs/install/cloud-auto-join.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Cloud Auto-join
-sidebar_title: Cloud Auto-join
 description: >-
   Consul supports automatically joining a Consul datacenter using cloud metadata
   on various providers.
diff --git a/website/content/docs/install/glossary.mdx b/website/content/docs/install/glossary.mdx
index 6225bf05d1..d7daf70d12 100644
--- a/website/content/docs/install/glossary.mdx
+++ b/website/content/docs/install/glossary.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Glossary
-sidebar_title: Glossary
 description: >-
   This page collects brief definitions of some of the technical terms used in
   the documentation.
diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx
index 9b3d0c6411..cbda2e1d67 100644
--- a/website/content/docs/install/index.mdx
+++ b/website/content/docs/install/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Get Started
-sidebar_title: Get Started
 description: |-
   Installing Consul is simple. You can download a precompiled binary, compile
   from source or run on Kubernetes. This page details these methods.
diff --git a/website/content/docs/install/performance.mdx b/website/content/docs/install/performance.mdx
index 3798b07041..42317f05a1 100644
--- a/website/content/docs/install/performance.mdx
+++ b/website/content/docs/install/performance.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Server Performance
-sidebar_title: Server Performance
 description: >-
   Consul requires different amounts of compute resources, depending on cluster
   size and expected workload. This guide provides guidance on choosing compute
diff --git a/website/content/docs/install/ports.mdx b/website/content/docs/install/ports.mdx
index f974587e4c..9ed1f50ec1 100644
--- a/website/content/docs/install/ports.mdx
+++ b/website/content/docs/install/ports.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Required Ports
-sidebar_title: Required Ports
 description: >-
   Before starting Consul it is important to have the necessary bind ports
   accessible.
diff --git a/website/content/docs/integrate/nia-integration.mdx b/website/content/docs/integrate/nia-integration.mdx
index 4de3e3db16..787c3e18bc 100644
--- a/website/content/docs/integrate/nia-integration.mdx
+++ b/website/content/docs/integrate/nia-integration.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Network Infrastructure Automation Integration Program
-sidebar_title: NIA Integration Program
 description: Guide to partnership integrations for Consul NIA
 ---
 
diff --git a/website/content/docs/integrate/partnerships.mdx b/website/content/docs/integrate/partnerships.mdx
index 44b2745a5c..50e8413af2 100644
--- a/website/content/docs/integrate/partnerships.mdx
+++ b/website/content/docs/integrate/partnerships.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Integration Program
-sidebar_title: Consul Integration Program
 description: Guide to partnership integrations for Consul.
 ---
 
diff --git a/website/content/docs/internals/index.mdx b/website/content/docs/internals/index.mdx
index f576663dd1..32fe3ce47e 100644
--- a/website/content/docs/internals/index.mdx
+++ b/website/content/docs/internals/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Internals
-sidebar_title: Internals
 description: >-
   This section covers some of the internals of Consul, such as the architecture,
   consensus and gossip protocols, and security model.
diff --git a/website/content/docs/intro/index.mdx b/website/content/docs/intro/index.mdx
index 4df7a0875a..6ab45c8da9 100644
--- a/website/content/docs/intro/index.mdx
+++ b/website/content/docs/intro/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Intro to Consul
-sidebar_title: Intro to Consul
 description: >-
   Welcome to the intro guide to Consul! This guide is the best place to start
   with Consul. We cover what Consul is, what problems it can solve, how it
diff --git a/website/content/docs/intro/vs/chef-puppet.mdx b/website/content/docs/intro/vs/chef-puppet.mdx
index 9382f28d0f..744e96861b 100644
--- a/website/content/docs/intro/vs/chef-puppet.mdx
+++ b/website/content/docs/intro/vs/chef-puppet.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Consul vs. Chef, Puppet, etc.'
-sidebar_title: 'Chef, Puppet, etc.'
 description: >-
   It is not uncommon to find people using Chef, Puppet, and other configuration
   management tools to build service discovery mechanisms. This is usually done
diff --git a/website/content/docs/intro/vs/custom.mdx b/website/content/docs/intro/vs/custom.mdx
index fe5b4921b6..0cb0cc51d8 100644
--- a/website/content/docs/intro/vs/custom.mdx
+++ b/website/content/docs/intro/vs/custom.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul vs. Custom Solutions
-sidebar_title: Custom Solutions
 description: >-
   As a codebase grows, a monolithic app often evolves into a Service Oriented
   Architecture (SOA). A universal pain point for SOA is service discovery and
diff --git a/website/content/docs/intro/vs/eureka.mdx b/website/content/docs/intro/vs/eureka.mdx
index 0e1a900cf0..7fe29af682 100644
--- a/website/content/docs/intro/vs/eureka.mdx
+++ b/website/content/docs/intro/vs/eureka.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul vs. Eureka
-sidebar_title: Eureka
 description: >-
   Eureka is a service discovery tool that provides a best effort registry and
   discovery service. It uses central servers and clients which are typically
diff --git a/website/content/docs/intro/vs/index.mdx b/website/content/docs/intro/vs/index.mdx
index fd4fa4dc64..efc9952e3c 100644
--- a/website/content/docs/intro/vs/index.mdx
+++ b/website/content/docs/intro/vs/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul vs. Other Software
-sidebar_title: Consul vs. Other Software
 description: >-
   The problems Consul solves are varied, but each individual feature has been
   solved by many different systems. Although there is no single system that
diff --git a/website/content/docs/intro/vs/istio.mdx b/website/content/docs/intro/vs/istio.mdx
index bdbb215dc2..19715e36a5 100644
--- a/website/content/docs/intro/vs/istio.mdx
+++ b/website/content/docs/intro/vs/istio.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul vs. Istio
-sidebar_title: Istio
 description: >-
   Istio is a platform for connecting and securing microservices. This page
   describes the similarities and differences between Istio and Consul.
diff --git a/website/content/docs/intro/vs/nagios.mdx b/website/content/docs/intro/vs/nagios.mdx
index be96634a1e..c075466c78 100644
--- a/website/content/docs/intro/vs/nagios.mdx
+++ b/website/content/docs/intro/vs/nagios.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Consul vs. Nagios'
-sidebar_title: 'Nagios'
 description: >-
   Nagios is a tool built for monitoring. It is used to quickly
   notify operators when an issue occurs.
diff --git a/website/content/docs/intro/vs/proxies.mdx b/website/content/docs/intro/vs/proxies.mdx
index cee0c4bde8..d4df15ab89 100644
--- a/website/content/docs/intro/vs/proxies.mdx
+++ b/website/content/docs/intro/vs/proxies.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul vs. Envoy and Other Proxies
-sidebar_title: Envoy and Other Proxies
 description: >-
   Modern service proxies provide high-level service routing, authentication,
   telemetry, and more for microservice and cloud environments. Envoy is a
diff --git a/website/content/docs/intro/vs/serf.mdx b/website/content/docs/intro/vs/serf.mdx
index 8b81904a0d..dc7af98edc 100644
--- a/website/content/docs/intro/vs/serf.mdx
+++ b/website/content/docs/intro/vs/serf.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul vs. Serf
-sidebar_title: Serf
 description: >-
   Serf is a node discovery and orchestration tool and is the only tool discussed
   so far that is built on an eventually-consistent gossip model with no
diff --git a/website/content/docs/intro/vs/skydns.mdx b/website/content/docs/intro/vs/skydns.mdx
index c645014a19..3db4000766 100644
--- a/website/content/docs/intro/vs/skydns.mdx
+++ b/website/content/docs/intro/vs/skydns.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul vs. SkyDNS
-sidebar_title: SkyDNS
 description: >-
   SkyDNS is a tool designed to provide service discovery. It uses multiple
   central servers that are strongly-consistent and fault-tolerant. Nodes
diff --git a/website/content/docs/intro/vs/smartstack.mdx b/website/content/docs/intro/vs/smartstack.mdx
index 816a638a04..dbac8f2e09 100644
--- a/website/content/docs/intro/vs/smartstack.mdx
+++ b/website/content/docs/intro/vs/smartstack.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul vs. SmartStack
-sidebar_title: SmartStack
 description: >-
   SmartStack is a tool which tackles the service discovery problem. It has a
   rather unique architecture and has 4 major components: ZooKeeper, HAProxy,
diff --git a/website/content/docs/intro/vs/zookeeper.mdx b/website/content/docs/intro/vs/zookeeper.mdx
index 4cdd68a214..647627a67a 100644
--- a/website/content/docs/intro/vs/zookeeper.mdx
+++ b/website/content/docs/intro/vs/zookeeper.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 'Consul vs. ZooKeeper, doozerd, etcd'
-sidebar_title: 'ZooKeeper, doozerd, etcd'
 description: >-
   ZooKeeper, doozerd, and etcd are all similar in their architecture. All three
   have server nodes that require a quorum of nodes to operate (usually a simple
diff --git a/website/content/docs/k8s/connect/ambassador.mdx b/website/content/docs/k8s/connect/ambassador.mdx
index 7939d2c943..77c1c74a0a 100644
--- a/website/content/docs/k8s/connect/ambassador.mdx
+++ b/website/content/docs/k8s/connect/ambassador.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Ambassador Integration - Kubernetes
-sidebar_title: Ambassador Integration
 description: |-
   Ambassador is a Kubernetes-native API gateway and ingress controller that
   integrates well with Consul Connect.
diff --git a/website/content/docs/k8s/connect/connect-ca-provider.mdx b/website/content/docs/k8s/connect/connect-ca-provider.mdx
index af28c41d21..fbb4347409 100644
--- a/website/content/docs/k8s/connect/connect-ca-provider.mdx
+++ b/website/content/docs/k8s/connect/connect-ca-provider.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Configuring a Connect CA Provider
-sidebar_title: Configuring a Connect CA Provider
 description: Configuring a Connect CA Provider
 ---
 
diff --git a/website/content/docs/k8s/connect/health.mdx b/website/content/docs/k8s/connect/health.mdx
index 27783e29a5..1b94f3bd80 100644
--- a/website/content/docs/k8s/connect/health.mdx
+++ b/website/content/docs/k8s/connect/health.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Kubernetes Health Checks
-sidebar_title: Health Checks
 description: Configuring Kubernetes Health Checks
 ---
 
diff --git a/website/content/docs/k8s/connect/index.mdx b/website/content/docs/k8s/connect/index.mdx
index 21d5aa4d2c..5659870018 100644
--- a/website/content/docs/k8s/connect/index.mdx
+++ b/website/content/docs/k8s/connect/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Service Mesh - Kubernetes
-sidebar_title: Service Mesh
 description: >-
   Connect is a feature built into to Consul that enables automatic
   service-to-service authorization and connection encryption across your Consul
diff --git a/website/content/docs/k8s/connect/ingress-gateways.mdx b/website/content/docs/k8s/connect/ingress-gateways.mdx
index 50e6f288f9..99fc1ce46c 100644
--- a/website/content/docs/k8s/connect/ingress-gateways.mdx
+++ b/website/content/docs/k8s/connect/ingress-gateways.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Ingress Gateways - Kubernetes
-sidebar_title: Ingress Gateways
 description: Configuring Ingress Gateways on Kubernetes
 ---
 
diff --git a/website/content/docs/k8s/connect/observability/metrics.mdx b/website/content/docs/k8s/connect/observability/metrics.mdx
index ba6df8bd64..faa6b7838a 100644
--- a/website/content/docs/k8s/connect/observability/metrics.mdx
+++ b/website/content/docs/k8s/connect/observability/metrics.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Metrics
-sidebar_title: Metrics
 description: Metrics for Consul on Kubernetes
 ---
 
diff --git a/website/content/docs/k8s/connect/terminating-gateways.mdx b/website/content/docs/k8s/connect/terminating-gateways.mdx
index 56ec14f750..d96d6ba3be 100644
--- a/website/content/docs/k8s/connect/terminating-gateways.mdx
+++ b/website/content/docs/k8s/connect/terminating-gateways.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Terminating Gateways - Kubernetes
-sidebar_title: Terminating Gateways
 description: Configuring Terminating Gateways on Kubernetes
 ---
 
diff --git a/website/content/docs/k8s/crds/index.mdx b/website/content/docs/k8s/crds/index.mdx
index 3e0aaceca2..0ccdbfd73c 100644
--- a/website/content/docs/k8s/crds/index.mdx
+++ b/website/content/docs/k8s/crds/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Custom Resource Definitions
-sidebar_title: Custom Resource Definitions
 description: >-
   Consul supports managing configuration entries via Kubernetes Custom Resources.
   These custom resource can be used to manage the configuration for workloads
diff --git a/website/content/docs/k8s/crds/upgrade-to-crds.mdx b/website/content/docs/k8s/crds/upgrade-to-crds.mdx
index db11a4ff17..d5b0754206 100644
--- a/website/content/docs/k8s/crds/upgrade-to-crds.mdx
+++ b/website/content/docs/k8s/crds/upgrade-to-crds.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Upgrade An Existing Cluster to CRDs
-sidebar_title: Upgrade An Existing Cluster to CRDs
 description: >-
   Upgrade an existing cluster to use custom resources.
 ---
diff --git a/website/content/docs/k8s/dns.mdx b/website/content/docs/k8s/dns.mdx
index 5bb1038d46..5163e438c1 100644
--- a/website/content/docs/k8s/dns.mdx
+++ b/website/content/docs/k8s/dns.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul DNS - Kubernetes
-sidebar_title: Consul DNS
 description: >-
   One of the primary query interfaces to Consul is the DNS interface. The Consul
   DNS interface can be exposed for all pods in Kubernetes using a stub-domain
diff --git a/website/content/docs/k8s/helm.mdx b/website/content/docs/k8s/helm.mdx
index 2601a17f5d..0b12a4ad04 100644
--- a/website/content/docs/k8s/helm.mdx
+++ b/website/content/docs/k8s/helm.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Helm Chart Configuration
-sidebar_title: Helm Chart Configuration
 description: Configuration for the Consul Helm chart.
 ---
 
diff --git a/website/content/docs/k8s/index.mdx b/website/content/docs/k8s/index.mdx
index 0ca57b3472..c5becd9fcb 100644
--- a/website/content/docs/k8s/index.mdx
+++ b/website/content/docs/k8s/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Kubernetes
-sidebar_title: Kubernetes
 description: >-
   Consul has many integrations with Kubernetes. You can deploy Consul to
   Kubernetes using the Helm chart, sync services between Consul and Kubernetes,
diff --git a/website/content/docs/k8s/installation/deployment-configurations/clients-outside-kubernetes.mdx b/website/content/docs/k8s/installation/deployment-configurations/clients-outside-kubernetes.mdx
index 3c17199c3e..288691302f 100644
--- a/website/content/docs/k8s/installation/deployment-configurations/clients-outside-kubernetes.mdx
+++ b/website/content/docs/k8s/installation/deployment-configurations/clients-outside-kubernetes.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Clients Outside of Kubernetes - Kubernetes
-sidebar_title: Consul Clients Outside Kubernetes
 description: >-
   Consul clients running on non-Kubernetes nodes can join a Consul cluster
   running within Kubernetes.
diff --git a/website/content/docs/k8s/installation/deployment-configurations/consul-enterprise.mdx b/website/content/docs/k8s/installation/deployment-configurations/consul-enterprise.mdx
index cce457c5e8..37593cf232 100644
--- a/website/content/docs/k8s/installation/deployment-configurations/consul-enterprise.mdx
+++ b/website/content/docs/k8s/installation/deployment-configurations/consul-enterprise.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Enterprise
-sidebar_title: Consul Enterprise
 description: Configuration for running Consul Enterprise
 ---
 
diff --git a/website/content/docs/k8s/installation/deployment-configurations/servers-outside-kubernetes.mdx b/website/content/docs/k8s/installation/deployment-configurations/servers-outside-kubernetes.mdx
index 61c575a079..cc74f5af10 100644
--- a/website/content/docs/k8s/installation/deployment-configurations/servers-outside-kubernetes.mdx
+++ b/website/content/docs/k8s/installation/deployment-configurations/servers-outside-kubernetes.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Servers Outside of Kubernetes - Kubernetes
-sidebar_title: Consul Servers Outside Kubernetes
 description: Running Consul servers outside of Kubernetes
 ---
 
diff --git a/website/content/docs/k8s/installation/install.mdx b/website/content/docs/k8s/installation/install.mdx
index d7bf210263..c8b5c97ad9 100644
--- a/website/content/docs/k8s/installation/install.mdx
+++ b/website/content/docs/k8s/installation/install.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Install with Helm Chart - Kubernetes
-sidebar_title: Install with Helm Chart
 description: >-
   Consul can run directly on Kubernetes, both in server or client mode. For
   pure-Kubernetes workloads, this enables Consul to also exist purely within
diff --git a/website/content/docs/k8s/installation/multi-cluster/index.mdx b/website/content/docs/k8s/installation/multi-cluster/index.mdx
index 3de40a7fcc..85bf6d801f 100644
--- a/website/content/docs/k8s/installation/multi-cluster/index.mdx
+++ b/website/content/docs/k8s/installation/multi-cluster/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Multi-Cluster Federation Overview
-sidebar_title: Multi-Cluster Federation
 description: >-
   Installing on multiple Kubernetes clusters.
 ---
diff --git a/website/content/docs/k8s/installation/multi-cluster/kubernetes.mdx b/website/content/docs/k8s/installation/multi-cluster/kubernetes.mdx
index 9fd14b070b..76cdd9cdfa 100644
--- a/website/content/docs/k8s/installation/multi-cluster/kubernetes.mdx
+++ b/website/content/docs/k8s/installation/multi-cluster/kubernetes.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Federation Between Kubernetes Clusters
-sidebar_title: Federation Between Kubernetes Clusters
 description: >-
   Federating multiple Kubernetes clusters.
 ---
diff --git a/website/content/docs/k8s/installation/multi-cluster/vms-and-kubernetes.mdx b/website/content/docs/k8s/installation/multi-cluster/vms-and-kubernetes.mdx
index 3226efd07b..7ce18b1885 100644
--- a/website/content/docs/k8s/installation/multi-cluster/vms-and-kubernetes.mdx
+++ b/website/content/docs/k8s/installation/multi-cluster/vms-and-kubernetes.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Federation Between VMs and Kubernetes
-sidebar_title: Federation Between VMs and Kubernetes
 description: >-
   Federating Kubernetes clusters and VMs.
 ---
diff --git a/website/content/docs/k8s/installation/platforms/self-hosted-kubernetes.mdx b/website/content/docs/k8s/installation/platforms/self-hosted-kubernetes.mdx
index afe59bcadc..c20b7e1554 100644
--- a/website/content/docs/k8s/installation/platforms/self-hosted-kubernetes.mdx
+++ b/website/content/docs/k8s/installation/platforms/self-hosted-kubernetes.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Self Hosted Kubernetes
-sidebar_title: Self Hosted Kubernetes
 description: Installing Consul on Self Hosted Kubernetes
 ---
 
diff --git a/website/content/docs/k8s/operations/certificate-rotation.mdx b/website/content/docs/k8s/operations/certificate-rotation.mdx
index f520efef2e..f10100100b 100644
--- a/website/content/docs/k8s/operations/certificate-rotation.mdx
+++ b/website/content/docs/k8s/operations/certificate-rotation.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Certificate Rotation
-sidebar_title: Certificate Rotation
 description: Rotate Certificate on Kubernetes Cluster safely
 ---
 
diff --git a/website/content/docs/k8s/operations/tls-on-existing-cluster.mdx b/website/content/docs/k8s/operations/tls-on-existing-cluster.mdx
index 3310fc8521..daa3522ef1 100644
--- a/website/content/docs/k8s/operations/tls-on-existing-cluster.mdx
+++ b/website/content/docs/k8s/operations/tls-on-existing-cluster.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Configure TLS on an Existing Cluster
-sidebar_title: Configure TLS on an Existing Cluster
 description: Configure TLS on an existing Consul cluster running in Kubernetes
 ---
 
diff --git a/website/content/docs/k8s/operations/uninstall.mdx b/website/content/docs/k8s/operations/uninstall.mdx
index 777433103a..525e8aeddb 100644
--- a/website/content/docs/k8s/operations/uninstall.mdx
+++ b/website/content/docs/k8s/operations/uninstall.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Uninstall
-sidebar_title: Uninstall
 description: Uninstall Consul on Kubernetes
 ---
 
diff --git a/website/content/docs/k8s/service-sync.mdx b/website/content/docs/k8s/service-sync.mdx
index 092e18b79b..f1caeed303 100644
--- a/website/content/docs/k8s/service-sync.mdx
+++ b/website/content/docs/k8s/service-sync.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Service Sync - Kubernetes
-sidebar_title: Service Sync
 description: >-
   The services in Kubernetes and Consul can be automatically synced so that
   Kubernetes services are available to Consul agents and services in Consul can
diff --git a/website/content/docs/k8s/upgrade/compatibility.mdx b/website/content/docs/k8s/upgrade/compatibility.mdx
index 198b3666b2..385247f3de 100644
--- a/website/content/docs/k8s/upgrade/compatibility.mdx
+++ b/website/content/docs/k8s/upgrade/compatibility.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Compatibility Matrix
-sidebar_title: Compatibility Matrix
 description: Compatibility Matrix for Consul Kubernetes and Consul
 ---
 
diff --git a/website/content/docs/k8s/upgrade/index.mdx b/website/content/docs/k8s/upgrade/index.mdx
index fd37344933..c89255826c 100644
--- a/website/content/docs/k8s/upgrade/index.mdx
+++ b/website/content/docs/k8s/upgrade/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Upgrade
-sidebar_title: Upgrade
 description: Upgrade Consul on Kubernetes
 ---
 
diff --git a/website/content/docs/nia/api/api-overview.mdx b/website/content/docs/nia/api/api-overview.mdx
index 0d48ce38f8..969cc2964a 100644
--- a/website/content/docs/nia/api/api-overview.mdx
+++ b/website/content/docs/nia/api/api-overview.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul-Terraform-Sync API
-sidebar_title: Overview
 description: >-
   How to use the Consul-Terraform-Sync API
 ---
diff --git a/website/content/docs/nia/api/status.mdx b/website/content/docs/nia/api/status.mdx
index cc07f50ac1..33bde0b065 100644
--- a/website/content/docs/nia/api/status.mdx
+++ b/website/content/docs/nia/api/status.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul-Terraform-Sync Status API
-sidebar_title: Status
 description: >-
   Consul-Terraform-Sync Status API
 ---
diff --git a/website/content/docs/nia/api/tasks.mdx b/website/content/docs/nia/api/tasks.mdx
index c1edf72587..342e72eadd 100644
--- a/website/content/docs/nia/api/tasks.mdx
+++ b/website/content/docs/nia/api/tasks.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul-Terraform-Sync Tasks API
-sidebar_title: Tasks
 description: >-
   Consul-Terraform-Sync Tasks API
 ---
diff --git a/website/content/docs/nia/architecture.mdx b/website/content/docs/nia/architecture.mdx
index b4f139f0de..f418b6575b 100644
--- a/website/content/docs/nia/architecture.mdx
+++ b/website/content/docs/nia/architecture.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Architecture
-sidebar_title: Architecture
 description: >-
   Consul-Terraform-Sync Architecture
 ---
diff --git a/website/content/docs/nia/cli/cli-overview.mdx b/website/content/docs/nia/cli/cli-overview.mdx
index cafb9cc754..a85ea6a032 100644
--- a/website/content/docs/nia/cli/cli-overview.mdx
+++ b/website/content/docs/nia/cli/cli-overview.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul-Terraform-Sync CLI
-sidebar_title: Overview
 description: >-
   How to use the Consul-Terraform-Sync CLI
 ---
diff --git a/website/content/docs/nia/cli/task.mdx b/website/content/docs/nia/cli/task.mdx
index 4f735dec85..fdc46bc72e 100644
--- a/website/content/docs/nia/cli/task.mdx
+++ b/website/content/docs/nia/cli/task.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Task Command
-sidebar_title: task
 description: >-
   Consul-Terraform-Sync supports task commands for users to modify tasks while the daemon is running
 ---
diff --git a/website/content/docs/nia/compatibility.mdx b/website/content/docs/nia/compatibility.mdx
index 167d22404e..7d5841f53e 100644
--- a/website/content/docs/nia/compatibility.mdx
+++ b/website/content/docs/nia/compatibility.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul-Terraform-Sync Compatibility
-sidebar_title: Compatibility
 description: >-
   Consul-Terraform-Sync Compatibility
 ---
diff --git a/website/content/docs/nia/configuration.mdx b/website/content/docs/nia/configuration.mdx
index 6b7527e210..f76c34fb1c 100644
--- a/website/content/docs/nia/configuration.mdx
+++ b/website/content/docs/nia/configuration.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul-Terraform-Sync Configuration
-sidebar_title: Configuration
 description: >-
   Consul-Terraform-Sync requires a Terraform Provider, a Terraform Module and a running Consul Cluster outside of the consul-terraform-sync daemon.
 ---
diff --git a/website/content/docs/nia/index.mdx b/website/content/docs/nia/index.mdx
index 05f0b53b53..acac39c7ba 100644
--- a/website/content/docs/nia/index.mdx
+++ b/website/content/docs/nia/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Network Infrastructure Automation
-sidebar_title: Network Infrastructure Automation
 description: >-
   Network Infrastructure Automation (NIA) is the concept of dynamically updating infrastructure devices triggered by service changes. Consul-Terraform-Sync is a tool that performs NIA and utilizes Consul as a data source that contains networking information about services and monitors those services. Terraform is used as the underlying automation tool and leverages the Terraform provider ecosystem to drive relevant changes to the network infrastructure.
 ---
diff --git a/website/content/docs/nia/installation/configure.mdx b/website/content/docs/nia/installation/configure.mdx
index 7621469ac3..8edef8bf96 100644
--- a/website/content/docs/nia/installation/configure.mdx
+++ b/website/content/docs/nia/installation/configure.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Configure Consul-Terraform-Sync
-sidebar_title: Configure
 description: >-
   A high level guide to configure Consul-Terraform-Sync.
 ---
diff --git a/website/content/docs/nia/installation/install.mdx b/website/content/docs/nia/installation/install.mdx
index d7937e2d89..d7919d69b3 100644
--- a/website/content/docs/nia/installation/install.mdx
+++ b/website/content/docs/nia/installation/install.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Install Consul and Consul-Terraform-Sync
-sidebar_title: Installation
 description: >-
   Consul-Terraform-Sync is a daemon that runs alongside Consul. Consul-Terraform-Sync is not included with the Consul binary and will need to be installed separately.
 ---
diff --git a/website/content/docs/nia/installation/requirements.mdx b/website/content/docs/nia/installation/requirements.mdx
index e938c5f897..c64527e65a 100644
--- a/website/content/docs/nia/installation/requirements.mdx
+++ b/website/content/docs/nia/installation/requirements.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Requirements
-sidebar_title: Requirements
 description: >-
   Consul-Terraform-Sync requires a Terraform Provider, a Terraform Module, and a running Consul cluster outside of the consul-terraform-sync daemon.
 ---
diff --git a/website/content/docs/nia/installation/run.mdx b/website/content/docs/nia/installation/run.mdx
index e9e7c310f5..2511231301 100644
--- a/website/content/docs/nia/installation/run.mdx
+++ b/website/content/docs/nia/installation/run.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Run Consul-Terraform-Sync
-sidebar_title: Run Consul-Terraform-Sync
 description: >-
   Consul-Terraform-Sync requires a Terraform Provider, a Terraform Module and a running Consul Cluster outside of the consul-terraform-sync daemon.
 ---
diff --git a/website/content/docs/nia/network-drivers.mdx b/website/content/docs/nia/network-drivers.mdx
index d36fee9ec2..6282e30536 100644
--- a/website/content/docs/nia/network-drivers.mdx
+++ b/website/content/docs/nia/network-drivers.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Network Drivers
-sidebar_title: Network Drivers
 description: >-
   Consul-Terraform-Sync Network Drivers
 ---
diff --git a/website/content/docs/nia/tasks.mdx b/website/content/docs/nia/tasks.mdx
index c9fa27ad21..cfb1d4820b 100644
--- a/website/content/docs/nia/tasks.mdx
+++ b/website/content/docs/nia/tasks.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Tasks
-sidebar_title: Tasks
 description: >-
   Consul-Terraform-Sync Tasks
 ---
diff --git a/website/content/docs/nia/terraform-modules.mdx b/website/content/docs/nia/terraform-modules.mdx
index 8f6e4aa1ff..e13d622447 100644
--- a/website/content/docs/nia/terraform-modules.mdx
+++ b/website/content/docs/nia/terraform-modules.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Compatible Terraform Modules for NIA
-sidebar_title: Terraform Modules
 description: >-
   Consul-Terraform-Sync automates execution Terraform modules for network infrastructure automation.
 ---
diff --git a/website/content/docs/release-notes/1-9-0.mdx b/website/content/docs/release-notes/1-9-0.mdx
index 30a5b86325..9ea1c9ef14 100644
--- a/website/content/docs/release-notes/1-9-0.mdx
+++ b/website/content/docs/release-notes/1-9-0.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: 1.9.0
-sidebar_title: 1.9.0
 ---
 
 # Consul 1.9.0
diff --git a/website/content/docs/security/acl/acl-legacy.mdx b/website/content/docs/security/acl/acl-legacy.mdx
index 8bf808630e..122ead9f98 100644
--- a/website/content/docs/security/acl/acl-legacy.mdx
+++ b/website/content/docs/security/acl/acl-legacy.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: ACL System (Legacy Mode)
-sidebar_title: Legacy Mode
 description: >-
   Consul provides an optional Access Control List (ACL) system which can be used
   to control access to data and APIs. The ACL system is a Capability-based
diff --git a/website/content/docs/security/acl/acl-migrate-tokens.mdx b/website/content/docs/security/acl/acl-migrate-tokens.mdx
index 505d0e46e0..7e3f064ce8 100644
--- a/website/content/docs/security/acl/acl-migrate-tokens.mdx
+++ b/website/content/docs/security/acl/acl-migrate-tokens.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: ACL Token Migration
-sidebar_title: Token Migration
 description: >-
   Consul 1.4.0 introduces a new ACL system with improvements for the security
   and
diff --git a/website/content/docs/security/acl/acl-rules.mdx b/website/content/docs/security/acl/acl-rules.mdx
index 05a9c7b3a3..1dca5ec4e0 100644
--- a/website/content/docs/security/acl/acl-rules.mdx
+++ b/website/content/docs/security/acl/acl-rules.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: ACL Rules
-sidebar_title: ACL Rules
 description: >-
   Consul provides an optional Access Control List (ACL) system which can be used
   to control access to data and APIs. The ACL system is a Capability-based
diff --git a/website/content/docs/security/acl/acl-system.mdx b/website/content/docs/security/acl/acl-system.mdx
index 7380e8e531..01335adae0 100644
--- a/website/content/docs/security/acl/acl-system.mdx
+++ b/website/content/docs/security/acl/acl-system.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: ACL System
-sidebar_title: ACL System
 description: >-
   Consul provides an optional Access Control List (ACL) system which can be used
   to control access to data and APIs. The ACL system is a Capability-based
diff --git a/website/content/docs/security/acl/auth-methods/index.mdx b/website/content/docs/security/acl/auth-methods/index.mdx
index c18484d56d..102e156045 100644
--- a/website/content/docs/security/acl/auth-methods/index.mdx
+++ b/website/content/docs/security/acl/auth-methods/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: ACL Auth Methods
-sidebar_title: Auth Methods
 description: >-
   An auth method is a component in Consul that performs authentication against a
   trusted external party to authorize the creation of an ACL tokens usable
diff --git a/website/content/docs/security/acl/auth-methods/jwt.mdx b/website/content/docs/security/acl/auth-methods/jwt.mdx
index 1bf9fa2b1a..4c518677ec 100644
--- a/website/content/docs/security/acl/auth-methods/jwt.mdx
+++ b/website/content/docs/security/acl/auth-methods/jwt.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: JWT Auth Method
-sidebar_title: JWT
 description: >-
   The JWT auth method can be used to authenticate with Consul by providing a
   JWT directly. The JWT is cryptographically verified using locally-provided
diff --git a/website/content/docs/security/acl/auth-methods/kubernetes.mdx b/website/content/docs/security/acl/auth-methods/kubernetes.mdx
index 7f0a6478f4..107f3a2f79 100644
--- a/website/content/docs/security/acl/auth-methods/kubernetes.mdx
+++ b/website/content/docs/security/acl/auth-methods/kubernetes.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Kubernetes Auth Method
-sidebar_title: Kubernetes
 description: >-
   The Kubernetes auth method type allows for a Kubernetes service account token
   to be used to authenticate to Consul. This method of authentication makes it
diff --git a/website/content/docs/security/acl/auth-methods/oidc.mdx b/website/content/docs/security/acl/auth-methods/oidc.mdx
index 36022e2e61..ac749f95de 100644
--- a/website/content/docs/security/acl/auth-methods/oidc.mdx
+++ b/website/content/docs/security/acl/auth-methods/oidc.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: OIDC Auth Method
-sidebar_title: OIDC
 description: >-
   The OIDC auth method can be used to authenticate with Consul using OpenID
   Connect (OIDC). This method allows authentication via a configured OIDC
diff --git a/website/content/docs/security/acl/index.mdx b/website/content/docs/security/acl/index.mdx
index def5bab676..08d6488bac 100644
--- a/website/content/docs/security/acl/index.mdx
+++ b/website/content/docs/security/acl/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: ACL Guides
-sidebar_title: Access Control (ACLs)
 description: >-
   Consul provides an optional Access Control List (ACL) system which can be used
   to control access to data and APIs. Select the following guide for your use
diff --git a/website/content/docs/security/encryption.mdx b/website/content/docs/security/encryption.mdx
index 8d9a34137a..2956d19ee2 100644
--- a/website/content/docs/security/encryption.mdx
+++ b/website/content/docs/security/encryption.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Encryption
-sidebar_title: Encryption
 description: >-
   The Consul agent supports encrypting all of its network traffic. The exact
   method of encryption is described on the encryption internals page. There are
diff --git a/website/content/docs/security/index.mdx b/website/content/docs/security/index.mdx
index a0df271825..6c0fc6c676 100644
--- a/website/content/docs/security/index.mdx
+++ b/website/content/docs/security/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Security
-sidebar_title: Security
 description: >-
   Consul relies on both a lightweight gossip mechanism and an RPC system to
   provide various features. Both of the systems have different security
diff --git a/website/content/docs/security/security-models/core.mdx b/website/content/docs/security/security-models/core.mdx
index 1f92bdb205..affced1316 100644
--- a/website/content/docs/security/security-models/core.mdx
+++ b/website/content/docs/security/security-models/core.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Core Security Model
-sidebar_title: Core
 description: >-
   Security model including requirements, recommendations, and threats for the core Consul product.
 ---
diff --git a/website/content/docs/security/security-models/index.mdx b/website/content/docs/security/security-models/index.mdx
index 6cd9a51be0..9480c77760 100644
--- a/website/content/docs/security/security-models/index.mdx
+++ b/website/content/docs/security/security-models/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Security Models
-sidebar_title: Security Models
 description: >-
   Overview and links to various Consul security models.
 ---
diff --git a/website/content/docs/security/security-models/nia.mdx b/website/content/docs/security/security-models/nia.mdx
index 91ee1b9ad8..980a0e1833 100644
--- a/website/content/docs/security/security-models/nia.mdx
+++ b/website/content/docs/security/security-models/nia.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul NIA Security Model
-sidebar_title: Network Infrastructure Automation
 description: >-
   Security model including requirements, recommendations, and threats for Consul Network Infrastructure Automation (NIA).
 ---
diff --git a/website/content/docs/troubleshoot/common-errors.mdx b/website/content/docs/troubleshoot/common-errors.mdx
index eefe36a9ce..3307b048b8 100644
--- a/website/content/docs/troubleshoot/common-errors.mdx
+++ b/website/content/docs/troubleshoot/common-errors.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Common Error Messages
-sidebar_title: Common Error Messages
 ---
 
 # Common Error Messages
diff --git a/website/content/docs/troubleshoot/faq.mdx b/website/content/docs/troubleshoot/faq.mdx
index ad2339f5f3..5dc5b9fa38 100644
--- a/website/content/docs/troubleshoot/faq.mdx
+++ b/website/content/docs/troubleshoot/faq.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Frequently Asked Questions
-sidebar_title: FAQ
 ---
 
 # Frequently Asked Questions
diff --git a/website/content/docs/upgrading/compatibility.mdx b/website/content/docs/upgrading/compatibility.mdx
index 0e5df842ac..e43d112478 100644
--- a/website/content/docs/upgrading/compatibility.mdx
+++ b/website/content/docs/upgrading/compatibility.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Consul Protocol Compatibility Promise
-sidebar_title: Compatibility Promise
 description: >-
   We expect Consul to run in large clusters of long-running agents. Because
   safely upgrading agents in this sort of environment relies heavily on
diff --git a/website/content/docs/upgrading/index.mdx b/website/content/docs/upgrading/index.mdx
index 7a14d9b67a..23820c9da4 100644
--- a/website/content/docs/upgrading/index.mdx
+++ b/website/content/docs/upgrading/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Upgrade Consul
-sidebar_title: Upgrade
 description: >-
   Consul is meant to be a long-running agent on any nodes participating in a
   Consul cluster. These nodes consistently communicate with each other. As such,
diff --git a/website/content/docs/upgrading/instructions/general-process.mdx b/website/content/docs/upgrading/instructions/general-process.mdx
index 9090739018..c18e361f1e 100644
--- a/website/content/docs/upgrading/instructions/general-process.mdx
+++ b/website/content/docs/upgrading/instructions/general-process.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: General Upgrade Process
-sidebar_title: General Process
 description: >-
   Specific versions of Consul may have additional information about the upgrade
   process beyond the standard flow.
diff --git a/website/content/docs/upgrading/instructions/index.mdx b/website/content/docs/upgrading/instructions/index.mdx
index ece299c7b3..c1ec07505b 100644
--- a/website/content/docs/upgrading/instructions/index.mdx
+++ b/website/content/docs/upgrading/instructions/index.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Upgrade Instructions
-sidebar_title: Upgrade Instructions
 description: >-
   Specific versions of Consul may have additional information about the upgrade
   process beyond the standard flow.
diff --git a/website/content/docs/upgrading/instructions/upgrade-to-1-2-x.mdx b/website/content/docs/upgrading/instructions/upgrade-to-1-2-x.mdx
index 658fcd6303..b39a4d9894 100644
--- a/website/content/docs/upgrading/instructions/upgrade-to-1-2-x.mdx
+++ b/website/content/docs/upgrading/instructions/upgrade-to-1-2-x.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Upgrading to 1.2.4
-sidebar_title: Upgrading to 1.2.4
 description: >-
   Specific versions of Consul may have additional information about the upgrade
   process beyond the standard flow.
diff --git a/website/content/docs/upgrading/instructions/upgrade-to-1-6-x.mdx b/website/content/docs/upgrading/instructions/upgrade-to-1-6-x.mdx
index a441e87a41..d600adbb70 100644
--- a/website/content/docs/upgrading/instructions/upgrade-to-1-6-x.mdx
+++ b/website/content/docs/upgrading/instructions/upgrade-to-1-6-x.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Upgrading to 1.6.9
-sidebar_title: Upgrading to 1.6.9
 description: >-
   Specific versions of Consul may have additional information about the upgrade
   process beyond the standard flow.
diff --git a/website/content/docs/upgrading/instructions/upgrade-to-1-8-x.mdx b/website/content/docs/upgrading/instructions/upgrade-to-1-8-x.mdx
index 63bc4c740c..a229664a29 100644
--- a/website/content/docs/upgrading/instructions/upgrade-to-1-8-x.mdx
+++ b/website/content/docs/upgrading/instructions/upgrade-to-1-8-x.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Upgrading to 1.8.4
-sidebar_title: Upgrading to 1.8.4
 description: >-
   Specific versions of Consul may have additional information about the upgrade
   process beyond the standard flow.
diff --git a/website/content/docs/upgrading/upgrade-specific.mdx b/website/content/docs/upgrading/upgrade-specific.mdx
index edcf20906f..bffdab6344 100644
--- a/website/content/docs/upgrading/upgrade-specific.mdx
+++ b/website/content/docs/upgrading/upgrade-specific.mdx
@@ -1,7 +1,6 @@
 ---
 layout: docs
 page_title: Upgrading Specific Versions
-sidebar_title: Specific Version Details
 description: >-
   Specific versions of Consul may have additional information about the upgrade
   process beyond the standard flow.
diff --git a/website/content/intro/getting-started.mdx b/website/content/intro/getting-started.mdx
deleted file mode 100644
index 40e9302485..0000000000
--- a/website/content/intro/getting-started.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
----
-layout: intro
-page_title: Getting Started
-sidebar_title: Getting Started
-description: >-
-  Welcome to the intro guide to Consul! This guide is the best place to start
-  with Consul.
----
-
-# Getting Started
-
-The Getting Started guides will help you learn the basics of using Consul. They will walk you through how to set up a local development instance of Consul to practice running an agent, starting a service, and using Connect. Then you will set up a couple Consul servers and connect them to make a small cluster.
-
-After completing the guides, you will be familiar with all three of Consul’s use cases, service discovery, service configuration, and service segmentation. Continue to the Getting Started guides on our learning platform [learn.hashicorp.com](https://learn.hashicorp.com/consul).
diff --git a/website/content/intro/getting-started/agent.mdx b/website/content/intro/getting-started/agent.mdx
deleted file mode 100644
index 42e3c82313..0000000000
--- a/website/content/intro/getting-started/agent.mdx
+++ /dev/null
@@ -1,146 +0,0 @@
----
-layout: intro
-page_title: Run the Agent
-description: >
-  The Consul agent can run in either server or client mode. Each datacenter must
-  have at least one server, though a cluster of 3 or 5 servers is recommended. A
-  single server deployment is highly discouraged in production as data loss is
-  inevitable in a failure scenario.
----
-
-# Run the Consul Agent
-
-After Consul is installed, the agent must be run. The agent can run either
-in server or client mode. Each datacenter must have at least one server,
-though a cluster of 3 or 5 servers is recommended. A single server deployment
-is _**highly**_ discouraged as data loss is inevitable in a failure scenario.
-
-All other agents run in client mode. A client is a very lightweight
-process that registers services, runs health checks, and forwards queries to
-servers. The agent must be running on every node that is part of the cluster.
-
-For more detail on bootstrapping a datacenter, see
-[this guide](/docs/guides/bootstrapping).
-
-## Starting the Agent
-
-For simplicity, we'll start the Consul agent in development mode for now. This
-mode is useful for bringing up a single-node Consul environment quickly and
-easily. It is **not** intended to be used in production as it does not persist
-any state.
-
-```text
--$ consul agent -dev
-==> Starting Consul agent...
-==> Starting Consul agent RPC...
-==> Consul agent running!
-           Version: 'v0.7.0'
-         Node name: 'Armons-MacBook-Air'
-        Datacenter: 'dc1'
-            Server: true (bootstrap: false)
-       Client Addr: 127.0.0.1 (HTTP: 8500, HTTPS: -1, DNS: 8600, RPC: 8400)
-      Cluster Addr: 127.0.0.1 (LAN: 8301, WAN: 8302)
-    Gossip encrypt: false, RPC-TLS: false, TLS-Incoming: false
-
-==> Log data will now stream in as it occurs:
-
-    2016/09/15 10:21:10 [INFO] raft: Initial configuration (index=1): [{Suffrage:Voter ID:127.0.0.1:8300 Address:127.0.0.1:8300}]
-    2016/09/15 10:21:10 [INFO] raft: Node at 127.0.0.1:8300 [Follower] entering Follower state (Leader: "")
-    2016/09/15 10:21:10 [INFO] serf: EventMemberJoin: Armons-MacBook-Air 127.0.0.1
-    2016/09/15 10:21:10 [INFO] serf: EventMemberJoin: Armons-MacBook-Air.dc1 127.0.0.1
-    2016/09/15 10:21:10 [INFO] consul: Adding LAN server Armons-MacBook-Air (Addr: tcp/127.0.0.1:8300) (DC: dc1)
-    2016/09/15 10:21:10 [INFO] consul: Adding WAN server Armons-MacBook-Air.dc1 (Addr: tcp/127.0.0.1:8300) (DC: dc1)
-    2016/09/15 10:21:13 [DEBUG] http: Request GET /v1/agent/services (180.708µs) from=127.0.0.1:52369
-    2016/09/15 10:21:13 [DEBUG] http: Request GET /v1/agent/services (15.548µs) from=127.0.0.1:52369
-    2016/09/15 10:21:17 [WARN] raft: Heartbeat timeout from "" reached, starting election
-    2016/09/15 10:21:17 [INFO] raft: Node at 127.0.0.1:8300 [Candidate] entering Candidate state in term 2
-    2016/09/15 10:21:17 [DEBUG] raft: Votes needed: 1
-    2016/09/15 10:21:17 [DEBUG] raft: Vote granted from 127.0.0.1:8300 in term 2. Tally: 1
-    2016/09/15 10:21:17 [INFO] raft: Election won. Tally: 1
-    2016/09/15 10:21:17 [INFO] raft: Node at 127.0.0.1:8300 [Leader] entering Leader state
-    2016/09/15 10:21:17 [INFO] consul: cluster leadership acquired
-    2016/09/15 10:21:17 [DEBUG] consul: reset tombstone GC to index 3
-    2016/09/15 10:21:17 [INFO] consul: New leader elected: Armons-MacBook-Air
-    2016/09/15 10:21:17 [INFO] consul: member 'Armons-MacBook-Air' joined, marking health alive
-    2016/09/15 10:21:17 [INFO] agent: Synced service 'consul'
-```
-
-As you can see, the Consul agent has started and has output some log
-data. From the log data, you can see that our agent is running in server mode
-and has claimed leadership of the cluster. Additionally, the local member has
-been marked as a healthy member of the cluster.
-
-~> **Note for OS X Users:** Consul uses your hostname as the
-default node name. If your hostname contains periods, DNS queries to
-that node will not work with Consul. To avoid this, explicitly set
-the name of your node with the `-node` flag.
-
-## Cluster Members
-
-If you run [`consul members`](/commands/members) in another terminal, you
-can see the members of the Consul cluster. We'll cover joining clusters in the next
-section, but for now, you should only see one member (yourself):
-
-```shell-session
-$ consul members
-Node                Address            Status  Type    Build     Protocol  DC
-Armons-MacBook-Air  172.20.20.11:8301  alive   server  0.6.1dev  2         dc1
-```
-
-The output shows our own node, the address it is running on, its
-health state, its role in the cluster, and some version information.
-Additional metadata can be viewed by providing the `-detailed` flag.
-
-The output of the [`members`](/commands/members) command is based on
-the [gossip protocol](/docs/internals/gossip) and is eventually consistent.
-That is, at any point in time, the view of the world as seen by your local
-agent may not exactly match the state on the servers. For a strongly consistent
-view of the world, use the [HTTP API](/api) as it forwards the
-request to the Consul servers:
-
-```shell-session
-$ curl localhost:8500/v1/catalog/nodes
-[{"Node":"Armons-MacBook-Air","Address":"127.0.0.1","TaggedAddresses":{"lan":"127.0.0.1","wan":"127.0.0.1"},"CreateIndex":4,"ModifyIndex":110}]
-```
-
-In addition to the HTTP API, the [DNS interface](/docs/discovery/dns) can
-be used to query the node. Note that you have to make sure to point your DNS
-lookups to the Consul agent's DNS server which runs on port 8600 by default.
-The format of the DNS entries (such as "Armons-MacBook-Air.node.consul") will
-be covered in more detail later.
-
-```shell-session
-$ dig @127.0.0.1 -p 8600 Armons-MacBook-Air.node.consul
-...
-
-;; QUESTION SECTION:
-;Armons-MacBook-Air.node.consul.	IN	A
-
-;; ANSWER SECTION:
-Armons-MacBook-Air.node.consul.	0 IN	A	127.0.0.1
-```
-
-## Stopping the Agent ((#stopping))
-
-You can use `Ctrl-C` (the interrupt signal) to gracefully halt the agent.
-After interrupting the agent, you should see it leave the cluster
-and shut down.
-
-By gracefully leaving, Consul notifies other cluster members that the
-node _left_. If you had forcibly killed the agent process, other members
-of the cluster would have detected that the node _failed_. When a member leaves,
-its services and checks are removed from the catalog. When a member fails,
-its health is simply marked as critical, but it is not removed from the catalog.
-Consul will automatically try to reconnect to _failed_ nodes, allowing it
-to recover from certain network conditions, while _left_ nodes are no longer contacted.
-
-Additionally, if an agent is operating as a server, a graceful leave is important
-to avoid causing a potential availability outage affecting the
-[consensus protocol](/docs/internals/consensus). See the
-[guides section](/docs/guides) for details on how to safely add
-and remove servers.
-
-## Next Steps
-
-Your simple Consul cluster is up and running. Let's give it some
-[services](/intro/getting-started/services)!
diff --git a/website/content/intro/getting-started/checks.mdx b/website/content/intro/getting-started/checks.mdx
deleted file mode 100644
index 5607d9f74f..0000000000
--- a/website/content/intro/getting-started/checks.mdx
+++ /dev/null
@@ -1,112 +0,0 @@
----
-layout: intro
-page_title: Registering Health Checks
-description: >-
-  We've now seen how simple it is to run Consul, add nodes and services, and
-  query those nodes and services. In this step, we will continue our tour by
-  adding health checks to both nodes and services. Health checks are a critical
-  component of service discovery that prevent using services that are unhealthy.
----
-
-# Health Checks
-
-We've now seen how simple it is to run Consul, add nodes and services, and
-query those nodes and services. In this section, we will continue our tour
-by adding health checks to both nodes and services. Health checks are a
-critical component of service discovery that prevent using services that
-are unhealthy.
-
-This step builds upon [the Consul cluster created previously](/intro/getting-started/join).
-At this point, you should have a two-node cluster running.
-
-## Defining Checks
-
-Similar to a service, a check can be registered either by providing a
-[check definition](/docs/agent/checks) or by making the
-appropriate calls to the [HTTP API](/api/health).
-
-We will use the check definition approach because, just like with
-services, definitions are the most common way to set up checks.
-
-In Consul 0.9.0 and later the agent must be configured with
-`enable_script_checks` set to true in order to enable script checks.
-
-Create two definition files in the Consul configuration directory of
-the second node:
-
-```text
-vagrant@n2:~$ echo '{"check": {"name": "ping",
-  "args": ["ping", "-c1", "google.com"], "interval": "30s"}}' \
-  >/etc/consul.d/ping.json
-
-vagrant@n2:~$ echo '{"service": {"name": "web", "tags": ["rails"], "port": 80,
-  "check": {"args": ["curl", "localhost"], "interval": "10s"}}}' \
-  >/etc/consul.d/web.json
-```
-
-The first definition adds a host-level check named "ping". This check runs
-on a 30 second interval, invoking `ping -c1 google.com`. On a `script`-based
-health check, the check runs as the same user that started the Consul process.
-If the command exits with an exit code >= 2, then the check will be flagged as
-failing and the service will be considered unhealthy. An exit code of 1 will
-be considered as warning state. This is the contract for any
-[`script`-based health check](/docs/agent/checks#check-scripts).
-
-The second command modifies the service named `web`, adding a check that sends a
-request every 10 seconds via curl to verify that the web server is accessible.
-As with the host-level health check, if the script exits with an exit code >= 2,
-the check will be flagged as failing and the service will be considered unhealthy.
-
-Now, restart the second agent, reload it with `consul reload`, or send it a `SIGHUP` signal. You should see the
-following log lines:
-
-```text
-==> Starting Consul agent...
-...
-    [INFO] agent: Synced service 'web'
-    [INFO] agent: Synced check 'service:web'
-    [INFO] agent: Synced check 'ping'
-    [WARN] Check 'service:web' is now critical
-```
-
-The first few lines indicate that the agent has synced the new
-definitions. The last line indicates that the check we added for
-the `web` service is critical. This is because we're not actually running
-a web server, so the curl test is failing!
-
-## Checking Health Status
-
-Now that we've added some simple checks, we can use the HTTP API to inspect
-them. First, we can look for any failing checks using this command (note, this
-can be run on either node):
-
-```text
-vagrant@n1:~$ curl http://localhost:8500/v1/health/state/critical
-[{"Node":"agent-two","CheckID":"service:web","Name":"Service 'web' check","Status":"critical","Notes":"","ServiceID":"web","ServiceName":"web","ServiceTags":["rails"]}]
-```
-
-We can see that there is only a single check, our `web` service check, in the
-`critical` state.
-
-Additionally, we can attempt to query the web service using DNS. Consul
-will not return any results since the service is unhealthy:
-
-```text
-dig @127.0.0.1 -p 8600 web.service.consul
-...
-
-;; QUESTION SECTION:
-;web.service.consul.		IN	A
-```
-
-## Next Steps
-
-In this section, you learned how easy it is to add health checks. Check definitions
-can be updated by changing configuration files and sending a `SIGHUP` to the agent.
-Alternatively, the HTTP API can be used to add, remove, and modify checks dynamically.
-The API also allows for a "dead man's switch", a
-[TTL-based check](/docs/agent/checks#TTL). TTL checks can be used to integrate an
-application more tightly with Consul, enabling business logic to be evaluated as part
-of assessing the state of the check.
-
-Next, we will explore [Consul's K/V store](/intro/getting-started/kv).
diff --git a/website/content/intro/getting-started/connect.mdx b/website/content/intro/getting-started/connect.mdx
deleted file mode 100644
index d0d7d92206..0000000000
--- a/website/content/intro/getting-started/connect.mdx
+++ /dev/null
@@ -1,263 +0,0 @@
----
-layout: intro
-page_title: Consul Connect
-description: >-
-  Connect is a feature of Consul that provides service-to-service connection
-  authorization and encryption using mutual TLS. This ensures that all service
-  communication in your datacenter is encrypted and that the rules of what
-  services can communicate is centrally managed with Consul.
----
-
-# Connect
-
-We've now registered our first service with Consul and we've shown how you
-can use the HTTP API or DNS interface to query the address and directly connect
-to that service. Consul also provides a feature called **Connect** for
-automatically connecting via an encrypted TLS connection and authorizing
-which services are allowed to connect to each other.
-
-Applications do not need to be modified at all to use Connect.
-[Sidecar proxies](/docs/connect/proxies) can be used
-to automatically establish TLS connections for inbound and outbound connections
-without being aware of Connect at all. Applications may also
-[natively integrate with Connect](/docs/connect/native)
-for optimal performance and security.
-
--> **Security note:** The getting started guide will show Connect features and
-focus on ease of use with a dev-mode agent. We will _not setup_ Connect in a
-production-recommended secure way. Please read the [Connect production
-guide](/docs/guides/connect-production) to understand the tradeoffs.
-
-## Starting a Connect-unaware Service
-
-Let's begin by starting a service that is unaware of Connect. To keep it simple,
-let's just use `socat` to start a basic echo service. This service will accept
-TCP connections and echo back any data sent to it. If `socat` isn't installed on
-your machine, it should be easily available via a package manager.
-
-```shell-session
-$ socat -v tcp-l:8181,fork exec:"/bin/cat"
-```
-
-You can verify it is working by using `nc` to connect directly to it. Once
-connected, type some text and press enter. The text you typed should be
-echoed back:
-
-```shell-session
-$ nc 127.0.0.1 8181
-hello
-hello
-echo
-echo
-```
-
-`socat` is a decades-old Unix utility and our process is configured to
-only accept a basic TCP connection. It has no concept of encryption, the
-TLS protocol, etc. This can be representative of an existing service in
-your datacenter such as a database, backend web service, etc.
-
-## Registering the Service with Consul and Connect
-
-Next, let's register the service with Consul. We'll do this by writing
-a new service definition. This is the same as the previous step in the
-getting started guide, except this time we'll also configure Connect.
-
-```shell-session
-$ cat <<EOF | sudo tee /etc/consul.d/socat.json
-{
-  "service": {
-    "name": "socat",
-    "port": 8181,
-    "connect": { "sidecar_service": {} }
-  }
-}
-EOF
-```
-
-After saving this, run `consul reload` or send a `SIGHUP` signal to Consul
-so it reads the new configuration.
-
-Notice the only difference is the line starting with `"connect"`. The existence
-of this empty configuration notifies Consul to register a sidecar proxy for this
-process. The proxy process represents that specific service. It accepts inbound
-connections on a dynamically allocated port, verifies and authorizes the TLS
-connection, and proxies back a standard TCP connection to the process.
-
-The sidecar service registration here is just telling Consul that a proxy should
-be running, Consul won't actually run a proxy process for you.
-
-We need to start the proxy process in another terminal:
-
-```shell-session
-$ consul connect proxy -sidecar-for socat
-==> Consul Connect proxy starting...
-    Configuration mode: Agent API
-        Sidecar for ID: socat
-              Proxy ID: socat-sidecar-proxy
-
-...
-```
-
-## Connecting to the Service
-
-Next, let's connect to the service. We'll first do this by using the `consul connect proxy` command again directly. This time we use the command to configure
-and run a local proxy that can represent a service. This is a useful tool for
-development since it'll let you masquerade as any service (that you have
-permissions for) and establish connections to other services via Connect.
-
-The command below starts a proxy representing a service "web". We request
-an upstream dependency of "socat" (the service we previously registered)
-on port 9191. With this configuration, all TCP connections to 9191 will
-perform service discovery for a Connect-capable "socat" endpoint and establish
-a mutual TLS connection identifying as the service "web".
-
-```shell-session
-$ consul connect proxy -service web -upstream socat:9191
-==> Consul Connect proxy starting...
-    Configuration mode: Flags
-               Service: web
-              Upstream: socat => :9191
-       Public listener: Disabled
-
-...
-```
-
-With that running, we can verify it works by establishing a connection:
-
-```shell-session
-$ nc 127.0.0.1 9191
-hello
-hello
-```
-
-**The connection between proxies is now encrypted and authorized.**
-We're now communicating to the "socat" service via a TLS connection.
-The local connections to/from the proxy are unencrypted, but in production
-these will be loopback-only connections. Any traffic in and out of the
-machine is always encrypted.
-
-## Registering a Dependent Service
-
-We previously established a connection by directly running `consul connect proxy` in developer mode. Realistically, services need to establish connections
-to dependencies over Connect. Let's register a service "web" that registers
-"socat" as an upstream dependency in its sidecar registration:
-
-```shell-session
-$ cat <<EOF | sudo tee /etc/consul.d/web.json
-{
-  "service": {
-    "name": "web",
-    "port": 8080,
-    "connect": {
-      "sidecar_service": {
-        "proxy": {
-          "upstreams": [{
-             "destination_name": "socat",
-             "local_bind_port": 9191
-          }]
-        }
-      }
-    }
-  }
-}
-EOF
-```
-
-This registers a sidecar proxy for the service "web" that
-should listen on port 9191 to establish connections to "socat" as "web". The
-"web" service should then use that local port to talk to socat rather than
-directly attempting to connect.
-
-With that file in place, use `consul reload` or SIGHUP to reload Consul. If the
-proxy command from the previous section (with the inline upstream listener) is
-still running, stop it with `Ctrl-C`. Now we can start the web proxy using the
-configuration from the sidecar registration as we did for socat.
-
-```shell-session
-$ consul connect proxy -sidecar-for web
-==> Consul Connect proxy starting...
-    Configuration mode: Agent API
-        Sidecar for ID: web
-              Proxy ID: web-sidecar-proxy
-
-==> Log data will now stream in as it occurs:
-
-    2018/10/09 12:34:20 [INFO] 127.0.0.1:9191->service:default/socat starting on 127.0.0.1:9191
-    2018/10/09 12:34:20 [INFO] Proxy loaded config and ready to serve
-    2018/10/09 12:34:20 [INFO] TLS Identity: spiffe://df34ef6b-5971-ee61-0790-ca8622c3c287.consul/ns/default/dc/dc1/svc/web
-    2018/10/09 12:34:20 [INFO] TLS Roots   : [Consul CA 7]
-```
-
-Note in the first log line that the proxy discovered its configuration from the
-local agent and setup a local listener on port 9191 that will proxy to the socat
-service just as we configured in the sidecar registration.
-
-You can also see the identity URL from the certificate it loaded from the agent
-identifying it as the "web" service and the set of trusted root CAs it knows
-about.
-
--> **Security note:** The Connect security model requires trusting
-loopback connections when proxies are in use. To further secure this,
-tools like network namespacing may be used.
-
-We can verify it works by establishing a new connection:
-
-```shell-session
-$ nc 127.0.0.1 9191
-hello
-hello
-```
-
-## Controlling Access with Intentions
-
-Intentions are used to define which services may communicate. Our connections
-above succeeded because in a development mode agent, the ACL system is "allow
-all" by default.
-
-Let's insert a rule to deny access from web to socat:
-
-```shell-session
-$ consul intention create -deny web socat
-Created: web => socat (deny)
-```
-
-With the proxy processes running that we setup previously, connection
-attempts now fail:
-
-```shell-session
-$ nc 127.0.0.1 9191
-$
-```
-
-Try deleting the intention and attempt the connection again.
-
-```shell-session
-$ consul intention delete web socat
-Intention deleted.
-$ nc 127.0.0.1 9191
-hello
-hello
-```
-
-Intentions allow services to be segmented via a centralized control plane
-(Consul). To learn more, read the reference documentation on
-[intentions](/docs/connect/intentions).
-
-Note that in the current release of Consul, changing intentions will not
-affect existing connections. Therefore, you must establish a new connection
-to see the effects of a changed intention. This will be addressed in the near
-term in a future version of Consul.
-
-## Discover More Connect
-
-This quick guide has given a taste of what Connect can do but there is much
-more. Take a look at [getting started with
-Connect](/docs/connect#getting-started-with-connect) for more guides
-on setting up Connect with Envoy proxy, with Docker and in Kubernetes.
-
-## Next Steps
-
-We've now configured a service on a single agent and used Connect for
-automatic connection authorization and encryption. This is a great feature
-highlight but let's explore the full value of Consul by [setting up our
-first cluster](/intro/getting-started/join)!
diff --git a/website/content/intro/getting-started/consul.d/web.json b/website/content/intro/getting-started/consul.d/web.json
deleted file mode 100644
index 7b1cafac60..0000000000
--- a/website/content/intro/getting-started/consul.d/web.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "service": { "name": "web", "tags": ["rails"], "port": 80 } }
diff --git a/website/content/intro/getting-started/install.mdx b/website/content/intro/getting-started/install.mdx
deleted file mode 100644
index 080e6da82e..0000000000
--- a/website/content/intro/getting-started/install.mdx
+++ /dev/null
@@ -1,59 +0,0 @@
----
-layout: intro
-page_title: Installing Consul
-description: >-
-  Consul must first be installed on every node that will be a member of the
-  Consul cluster. To make installation easy, Consul is distributed as a binary
-  package for all supported platforms and architectures. This page will not
-  cover how to compile Consul from source.
----
-
-# Install Consul
-
-Consul must first be installed on your machine. Consul is distributed as a
-[binary package](/downloads) for all supported platforms and architectures.
-This page will not cover how to compile Consul from source, but compiling from
-source is covered in the [documentation](/docs) for those who want to
-be sure they're compiling source they trust into the final binary.
-
-## Installing Consul
-
-To install Consul, find the [appropriate package](/downloads) for
-your system and download it. Consul is packaged as a zip archive.
-
-After downloading Consul, unzip the package. Consul runs as a single binary
-named `consul`. Any other files in the package can be safely removed and
-Consul will still function.
-
-The final step is to make sure that the `consul` binary is available on the `PATH`.
-See [this page](https://stackoverflow.com/questions/14637979/how-to-permanently-set-path-on-linux)
-for instructions on setting the PATH on Linux and Mac.
-[This page](https://stackoverflow.com/questions/1618280/where-can-i-set-path-to-make-exe-on-windows)
-contains instructions for setting the PATH on Windows.
-
-## Verifying the Installation
-
-After installing Consul, verify the installation worked by opening a new
-terminal session and checking that `consul` is available. By executing
-`consul` you should see help output similar to this:
-
-```shell-session
-$ consul
-usage: consul [--version] [--help] <command> [<args>]
-
-Available commands are:
-    agent          Runs a Consul agent
-    event          Fire a new event
-
-# ...
-```
-
-If you get an error that `consul` could not be found, your `PATH`
-environment variable was not set up properly. Please go back and ensure
-that your `PATH` variable contains the directory where Consul was
-installed.
-
-## Next Steps
-
-Consul is installed and ready for operation. Let's
-[run the agent](/intro/getting-started/agent)!
diff --git a/website/content/intro/getting-started/join.mdx b/website/content/intro/getting-started/join.mdx
deleted file mode 100644
index 0e4d1a8529..0000000000
--- a/website/content/intro/getting-started/join.mdx
+++ /dev/null
@@ -1,189 +0,0 @@
----
-layout: intro
-page_title: Consul Cluster
-description: >
-  When a Consul agent is started, it begins as an isolated cluster of its own.
-  To learn about other cluster members, the agent must join one or more other
-  nodes using a provided join address. In this step, we will set up a two-node
-  cluster and join the nodes together.
----
-
-# Consul Cluster
-
-We've started our first agent and registered and queried a service on that
-agent. Additionally, we've configured Consul Connect to automatically authorize and encrypt connections between services. This showed how easy it is to use Consul but didn't show how this could be extended to a scalable, production-grade service mesh infrastructure.
-In this step, we'll create our first real cluster with multiple members.
-
-When a Consul agent is started, it begins without knowledge of any other node:
-it is an isolated cluster of one. To learn about other cluster members, the
-agent must _join_ an existing cluster. To join an existing cluster, it only
-needs to know about a _single_ existing member. After it joins, the agent will
-gossip with this member and quickly discover the other members in the cluster.
-A Consul agent can join any other agent, not just agents in server mode.
-
-## Starting the Agents
-
-To simulate a more realistic cluster, we will start a two node cluster via
-[Vagrant](https://www.vagrantup.com/). The Vagrantfile we will be using can
-be found in the [demo section of the Consul repo](https://github.com/hashicorp/consul/tree/master/demo/vagrant-cluster).
-
-We first boot our two nodes:
-
-```shell-session
-$ vagrant up
-```
-
-Once the systems are available, we can ssh into them to begin configuration
-of our cluster. We start by logging in to the first node:
-
-```shell-session
-$ vagrant ssh n1
-```
-
-In our previous examples, we used the [`-dev`
-flag](/docs/agent/options#_dev) to quickly set up a development server.
-However, this is not sufficient for use in a clustered environment. We will
-omit the `-dev` flag from here on, and instead specify our clustering flags as
-outlined below.
-
-Each node in a cluster must have a unique name. By default, Consul uses the
-hostname of the machine, but we'll manually override it using the [`-node`
-command-line option](/docs/agent/options#_node).
-
-We will also specify a [`bind` address](/docs/agent/options#_bind):
-this is the address that Consul listens on, and it _must_ be accessible by
-all other nodes in the cluster. While a `bind` address is not strictly
-necessary, it's always best to provide one. Consul will by default attempt to
-listen on all IPv4 interfaces on a system, but will fail to start with an
-error if multiple private IPs are found. Since production servers often
-have multiple interfaces, specifying a `bind` address assures that you will
-never bind Consul to the wrong interface.
-
-The first node will act as our sole server in this cluster, and we indicate
-this with the [`server` switch](/docs/agent/options#_server).
-
-The [`-bootstrap-expect` flag](/docs/agent/options#_bootstrap_expect)
-hints to the Consul server the number of additional server nodes we are
-expecting to join. The purpose of this flag is to delay the bootstrapping of
-the replicated log until the expected number of servers has successfully joined.
-You can read more about this in the [bootstrapping
-guide](/docs/guides/bootstrapping).
-
-We've included the [`-enable-script-checks`](/docs/agent/options#_enable_script_checks)
-flag set to `true` in order to enable health checks that can execute external scripts.
-This will be used in examples later. For production use, you'd want to configure
-[ACLs](/docs/guides/acl) in conjunction with this to control the ability to
-register arbitrary scripts.
-
-Finally, we add the [`config-dir` flag](/docs/agent/options#_config_dir),
-marking where service and check definitions can be found.
-
-All together, these settings yield a
-[`consul agent`](/commands/agent) command like this:
-
-```text
-vagrant@n1:~$ consul agent -server -bootstrap-expect=1 \
-	-data-dir=/tmp/consul -node=agent-one -bind=172.20.20.10 \
-	-enable-script-checks=true -config-dir=/etc/consul.d
-...
-```
-
-Now, in another terminal, we will connect to the second node:
-
-```shell-session
-$ vagrant ssh n2
-```
-
-This time, we set the [`bind` address](/docs/agent/options#_bind)
-address to match the IP of the second node as specified in the Vagrantfile
-and the [`node` name](/docs/agent/options#_node) to be `agent-two`.
-Since this node will not be a Consul server, we don't provide a
-[`server` switch](/docs/agent/options#_server).
-
-All together, these settings yield a
-[`consul agent`](/commands/agent) command like this:
-
-```text
-vagrant@n2:~$ consul agent -data-dir=/tmp/consul -node=agent-two \
-	-bind=172.20.20.11 -enable-script-checks=true -config-dir=/etc/consul.d
-...
-```
-
-At this point, you have two Consul agents running: one server and one client.
-The two Consul agents still don't know anything about each other and are each
-part of their own single-node clusters. You can verify this by running
-[`consul members`](/commands/members) against each agent and noting
-that only one member is visible to each agent.
-
-## Joining a Cluster
-
-Now, we'll tell the first agent to join the second agent by running
-the following commands in a new terminal:
-
-```shell-session
-$ vagrant ssh n1
-...
-vagrant@n1:~$ consul join 172.20.20.11
-Successfully joined cluster by contacting 1 nodes.
-```
-
-You should see some log output in each of the agent logs. If you read
-carefully, you'll see that they received join information. If you
-run [`consul members`](/commands/members) against each agent,
-you'll see that both agents now know about each other:
-
-```text
-vagrant@n2:~$ consul members
-Node       Address            Status  Type    Build  Protocol
-agent-two  172.20.20.11:8301  alive   client  0.5.0  2
-agent-one  172.20.20.10:8301  alive   server  0.5.0  2
-```
-
--> **Remember:** To join a cluster, a Consul agent only needs to
-learn about <em>one existing member</em>. After joining the cluster, the
-agents gossip with each other to propagate full membership information.
-
-## Auto-joining a Cluster on Start
-
-Ideally, whenever a new node is brought up in your datacenter, it should automatically join the Consul cluster without human intervention. Consul facilitates auto-join by enabling the auto-discovery of instances in AWS, Google Cloud or Azure with a given tag key/value. To use the integration, add the [`retry_join_ec2`](/docs/agent/options#retry_join_ec2), [`retry_join_gce`](/docs/agent/options#retry_join_gce) or the [`retry_join_azure`](/docs/agent/options#retry_join_azure) nested object to your Consul configuration file. This will allow a new node to join the cluster without any hardcoded configuration. Alternatively, you can join a cluster at startup using the [`-join` flag](/docs/agent/options#_join) or [`start_join` setting](/docs/agent/options#start_join) with hardcoded addresses of other known Consul agents.
-
-## Querying Nodes
-
-Just like querying services, Consul has an API for querying the
-nodes themselves. You can do this via the DNS or HTTP API.
-
-For the DNS API, the structure of the names is `NAME.node.consul` or
-`NAME.node.DATACENTER.consul`. If the datacenter is omitted, Consul
-will only search the local datacenter.
-
-For example, from "agent-one", we can query for the address of the
-node "agent-two":
-
-```
-vagrant@n1:~$ dig @127.0.0.1 -p 8600 agent-two.node.consul
-...
-
-;; QUESTION SECTION:
-;agent-two.node.consul.	IN	A
-
-;; ANSWER SECTION:
-agent-two.node.consul.	0 IN	A	172.20.20.11
-```
-
-The ability to look up nodes in addition to services is incredibly
-useful for system administration tasks. For example, knowing the address
-of the node to SSH into is as easy as making the node a part of the
-Consul cluster and querying it.
-
-## Leaving a Cluster
-
-To leave the cluster, you can either gracefully quit an agent (using
-`Ctrl-C`) or force kill one of the agents. Gracefully leaving allows
-the node to transition into the _left_ state; otherwise, other nodes
-will detect it as having _failed_. The difference is covered
-in more detail [here](/intro/getting-started/agent#stopping).
-
-## Next Steps
-
-We now have a multi-node Consul cluster up and running. Let's make
-our services more robust by giving them [health checks](/intro/getting-started/checks)!
diff --git a/website/content/intro/getting-started/kv.mdx b/website/content/intro/getting-started/kv.mdx
deleted file mode 100644
index f059036ce9..0000000000
--- a/website/content/intro/getting-started/kv.mdx
+++ /dev/null
@@ -1,136 +0,0 @@
----
-layout: intro
-page_title: KV Data
-description: >-
-  In addition to providing service discovery and integrated health checking,
-  Consul provides an easy to use KV store. This can be used to hold dynamic
-  configuration, assist in service coordination, build leader election, and
-  enable anything else a developer can think to build.
----
-
-# KV Data
-
-In addition to providing service discovery and integrated health checking,
-Consul provides an easy to use KV store. This can be used to hold
-dynamic configuration, assist in service coordination, build leader election,
-and enable anything else a developer can think to build.
-
-This step assumes you have at least one Consul agent already running.
-
-## Simple Usage
-
-To demonstrate how simple it is to get started, we will manipulate a few keys in
-the KV store. There are two ways to interact with the Consul KV store: via the
-HTTP API and via the Consul KV CLI. The examples below show using the Consul KV
-CLI because it is the easiest to get started. For more advanced integrations,
-you may want to use the [Consul KV HTTP API][kv-api]
-
-First let us explore the KV store. We can ask Consul for the value of the key at
-the path named `redis/config/minconns`:
-
-```shell-session
-$ consul kv get redis/config/minconns
-Error! No key exists at: redis/config/minconns
-```
-
-As you can see, we get no result, which makes sense because there is no data in
-the KV store. Next we can insert or "put" values into the KV store.
-
-```shell-session
-$ consul kv put redis/config/minconns 1
-Success! Data written to: redis/config/minconns
-
-$ consul kv put redis/config/maxconns 25
-Success! Data written to: redis/config/maxconns
-
-$ consul kv put -flags=42 redis/config/users/admin abcd1234
-Success! Data written to: redis/config/users/admin
-```
-
-Now that we have keys in the store, we can query for the value of individual
-keys:
-
-```shell-session
-$ consul kv get redis/config/minconns
-1
-```
-
-Consul retains additional metadata about the field, which is retrieved using the
-`-detailed` flag:
-
-```shell-session
-$ consul kv get -detailed redis/config/minconns
-CreateIndex      207
-Flags            0
-Key              redis/config/minconns
-LockIndex        0
-ModifyIndex      207
-Session          -
-Value            1
-```
-
-For the key "redis/config/users/admin", we set a `flag` value of 42. All keys
-support setting a 64-bit integer flag value. This is not used internally by
-Consul, but it can be used by clients to add meaningful metadata to any KV.
-
-It is possible to list all the keys in the store using the `recurse` options.
-Results will be returned in lexicographical order:
-
-```shell-session
-$ consul kv get -recurse
-redis/config/maxconns:25
-redis/config/minconns:1
-redis/config/users/admin:abcd1234
-```
-
-To delete a key from the Consul KV store, issue a "delete" call:
-
-```shell-session
-$ consul kv delete redis/config/minconns
-Success! Deleted key: redis/config/minconns
-```
-
-It is also possible to delete an entire prefix using the `recurse` option:
-
-```shell-session
-$ consul kv delete -recurse redis
-Success! Deleted keys with prefix: redis
-```
-
-To update the value of an existing key, "put" a value at the same path:
-
-```shell-session
-$ consul kv put foo bar
-
-$ consul kv get foo
-bar
-
-$ consul kv put foo zip
-
-$ consul kv get foo
-zip
-```
-
-Consul can provide atomic key updates using a Check-And-Set operation. To perform a CAS operation, specify the `-cas` flag:
-
-```shell-session
-$ consul kv put -cas -modify-index=123 foo bar
-Success! Data written to: foo
-
-$ consul kv put -cas -modify-index=123 foo bar
-Error! Did not write to foo: CAS failed
-```
-
-In this case, the first CAS update succeeds because the index is 123. The second
-operation fails because the index is no longer 123.
-
-## Next Steps
-
-These are only a few examples of what the API supports. For the complete
-documentation, please see [Consul KV HTTP API][kv-api] or
-[Consul KV CLI][kv-cli] documentation.
-
-Next, we will look at the [web UI](/intro/getting-started/ui) options supported by Consul.
-
-[kv-api]: /api/kv
-[kv-cli]: /commands/kv
diff --git a/website/content/intro/getting-started/next-steps.mdx b/website/content/intro/getting-started/next-steps.mdx
deleted file mode 100644
index 2414c6c841..0000000000
--- a/website/content/intro/getting-started/next-steps.mdx
+++ /dev/null
@@ -1,31 +0,0 @@
----
-layout: intro
-page_title: Next Steps
-description: >-
-  That concludes the getting started guide for Consul. Hopefully you're able to
-  see that while Consul is simple to use, it has a powerful set of features.
-  We've covered the basics for all of these features in this guide.
----
-
-# Next Steps
-
-That concludes the getting started guide for Consul. Hopefully you're able to
-see that while Consul is simple to use, it has a powerful set of features.
-We've covered the basics for all of these features in this guide.
-
-Consul is designed to be friendly to both the DevOps community and
-application developers, making it perfect for modern, elastic infrastructures.
-
-As a next step, the following resources are available:
-
-- [Documentation](/docs) - The documentation is an in-depth reference
-  guide to all the features of Consul, including technical details about the
-  internals of how Consul operates.
-
-- [Guides](/docs/guides) - This section provides various getting
-  started guides with Consul, including how to bootstrap a new datacenter.
-
-- [Examples](https://github.com/hashicorp/consul/tree/master/demo) -
-  The work-in-progress examples folder within the GitHub
-  repository for Consul contains functional examples of various use cases
-  of Consul to help you get started with exactly what you need.
diff --git a/website/content/intro/getting-started/services.mdx b/website/content/intro/getting-started/services.mdx
deleted file mode 100644
index 5581c076c8..0000000000
--- a/website/content/intro/getting-started/services.mdx
+++ /dev/null
@@ -1,166 +0,0 @@
----
-layout: intro
-page_title: Registering Services
-description: >
-  A service can be registered either by providing a service definition or by
-  making the appropriate calls to the HTTP API. A configuration file is the most
-  common, so we will use this approach to register a service, and then query
-  that service using the REST API and DNS interfaces.
----
-
-# Registering Services
-
-In the previous step, we ran our first agent, saw the cluster members (well,
-our cluster _member_), and queried that node. In this guide, we'll register
-our first service and query that service.
-
-## Defining a Service
-
-A service can be registered either by providing a
-[service definition](/docs/agent/services) or by making the appropriate
-calls to the [HTTP API](/api).
-
-A service definition is the most common way to register services, so we'll
-use that approach for this step. We'll be building on the agent configuration
-we covered in the [previous step](/intro/getting-started/agent).
-
-First, create a directory for Consul configuration. Consul loads all
-configuration files in the configuration directory, so a common convention
-on Unix systems is to name the directory something like `/etc/consul.d`
-(the `.d` suffix implies "this directory contains a set of configuration
-files").
-
-```shell-session
-$ sudo mkdir /etc/consul.d
-```
-
-Next, we'll write a service definition configuration file. Let's
-pretend we have a service named "web" running on port 80. Additionally,
-we'll give it a tag we can use as an additional way to query the service:
-
-```shell-session
-$ echo '{"service": {"name": "web", "tags": ["rails"], "port": 80}}' \
-    | sudo tee /etc/consul.d/web.json
-```
-
-Now, restart the agent, providing the configuration directory:
-
-```shell-session
-$ consul agent -dev -config-dir=/etc/consul.d
-==> Starting Consul agent...
-...
-    [INFO] agent: Synced service 'web'
-...
-```
-
-You'll notice in the output that it "synced" the web service. This means
-that the agent loaded the service definition from the configuration file,
-and has successfully registered it in the service catalog.
-
-If you wanted to register multiple services, you could create multiple
-service definition files in the Consul configuration directory.
-
-## Querying Services
-
-Once the agent is started and the service is synced, we can query the
-service using either the DNS or HTTP API.
-
-### DNS API
-
-Let's first query our service using the DNS API. For the DNS API, the
-DNS name for services is `NAME.service.consul`. By default, all DNS names
-are always in the `consul` namespace, though
-[this is configurable](/docs/agent/options#domain). The `service`
-subdomain tells Consul we're querying services, and the `NAME` is the name
-of the service.
-
-For the web service we registered, these conventions and settings yield a
-fully-qualified domain name of `web.service.consul`:
-
-```shell-session
-$ dig @127.0.0.1 -p 8600 web.service.consul
-...
-
-;; QUESTION SECTION:
-;web.service.consul.		IN	A
-
-;; ANSWER SECTION:
-web.service.consul.	0	IN	A	172.20.20.11
-```
-
-As you can see, an `A` record was returned with the IP address of the node on
-which the service is available. `A` records can only hold IP addresses.
-
-You can also use the DNS API to retrieve the entire address/port pair as a
-`SRV` record:
-
-```shell-session
-$ dig @127.0.0.1 -p 8600 web.service.consul SRV
-...
-
-;; QUESTION SECTION:
-;web.service.consul.		IN	SRV
-
-;; ANSWER SECTION:
-web.service.consul.	0	IN	SRV	1 1 80 Armons-MacBook-Air.node.dc1.consul.
-
-;; ADDITIONAL SECTION:
-Armons-MacBook-Air.node.dc1.consul. 0 IN A	172.20.20.11
-```
-
-The `SRV` record says that the web service is running on port 80 and exists on
-the node `Armons-MacBook-Air.node.dc1.consul.`. An additional section is returned by the
-DNS with the `A` record for that node.
-
-Finally, we can also use the DNS API to filter services by tags. The
-format for tag-based service queries is `TAG.NAME.service.consul`. In
-the example below, we ask Consul for all web services with the "rails"
-tag. We get a successful response since we registered our service with
-that tag:
-
-```shell-session
-$ dig @127.0.0.1 -p 8600 rails.web.service.consul
-...
-
-;; QUESTION SECTION:
-;rails.web.service.consul.		IN	A
-
-;; ANSWER SECTION:
-rails.web.service.consul.	0	IN	A	172.20.20.11
-```
-
-### HTTP API
-
-In addition to the DNS API, the HTTP API can be used to query services:
-
-```shell-session
-$ curl http://localhost:8500/v1/catalog/service/web
-[{"Node":"Armons-MacBook-Air","Address":"172.20.20.11","ServiceID":"web", \
-	"ServiceName":"web","ServiceTags":["rails"],"ServicePort":80}]
-```
-
-The catalog API gives all nodes hosting a given service. As we will see later
-with [health checks](/intro/getting-started/checks) you'll typically want
-to query just for healthy instances where the checks are passing. This is what
-DNS is doing under the hood. Here's a query to look for only healthy instances:
-
-```shell-session
-$ curl 'http://localhost:8500/v1/health/service/web?passing'
-[{"Node":"Armons-MacBook-Air","Address":"172.20.20.11","Service":{ \
-	"ID":"web", "Service":"web", "Tags":["rails"],"Port":80}, "Checks": ...}]
-```
-
-## Updating Services
-
-Service definitions can be updated by changing configuration files and
-sending a `SIGHUP` to the agent. This lets you update services without
-any downtime or unavailability to service queries.
-
-Alternatively, the HTTP API can be used to add, remove, and modify services
-dynamically.
-
-## Next Steps
-
-We've now configured a single agent and registered a service. This is good
-progress, but let's explore the full value of Consul by learning how to
-[automatically encrypt and authorize service-to service communication](/intro/getting-started/connect) with Consul Connect.
diff --git a/website/content/intro/getting-started/ui.mdx b/website/content/intro/getting-started/ui.mdx
deleted file mode 100644
index 7a00a92480..0000000000
--- a/website/content/intro/getting-started/ui.mdx
+++ /dev/null
@@ -1,36 +0,0 @@
----
-layout: intro
-page_title: Web UI
-description: >-
-  Consul comes with support for beautiful, functional web UIs out of the box.
-  UIs can be used for viewing all services and nodes, for viewing all health
-  checks and their current status, and for reading and setting key/value data.
-  The UIs automatically supports multi-datacenter.
----
-
-# Consul Web UI
-
-Consul comes with support for beautiful, functional web UIs out of the
-box. UIs can be used for viewing all services and nodes, for viewing
-all health checks and their current status, and for reading and setting
-key/value data. The UIs automatically support multi-datacenter.
-
-To set up the self-hosted UI, start the Consul agent with the
-[`-ui` parameter](/docs/agent/options#_ui):
-
-```shell-session
-$ consul agent -ui
-...
-```
-
-The UI is available at the `/ui` path on the same port as the HTTP API.
-By default this is `http://localhost:8500/ui`.
-
-You can view a live demo of the Consul Web UI
-[here](http://demo.consul.io).
-
-## Next Steps
-
-This concludes our Getting Started guide. See the
-[next steps](/intro/getting-started/next-steps) page to learn more about how to continue
-your journey with Consul!
diff --git a/website/data/api-docs-nav-data.json b/website/data/api-docs-nav-data.json
new file mode 100644
index 0000000000..8d214489e7
--- /dev/null
+++ b/website/data/api-docs-nav-data.json
@@ -0,0 +1,193 @@
+[
+  {
+    "title": "API Introduction",
+    "path": "index"
+  },
+  {
+    "title": "API Features",
+    "routes": [
+      {
+        "title": "Consistency Modes",
+        "path": "features/consistency"
+      },
+      {
+        "title": "Blocking Queries",
+        "path": "features/blocking"
+      },
+      {
+        "title": "Filtering",
+        "path": "features/filtering"
+      },
+      {
+        "title": "Agent Caching",
+        "path": "features/caching"
+      }
+    ]
+  },
+  {
+    "divider": true
+  },
+  {
+    "title": "ACLs",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "acl"
+      },
+      {
+        "title": "Tokens",
+        "path": "acl/tokens"
+      },
+      {
+        "title": "Legacy Tokens",
+        "path": "acl/legacy"
+      },
+      {
+        "title": "Policies",
+        "path": "acl/policies"
+      },
+      {
+        "title": "Roles",
+        "path": "acl/roles"
+      },
+      {
+        "title": "Auth Methods",
+        "path": "acl/auth-methods"
+      },
+      {
+        "title": "Binding Rules",
+        "path": "acl/binding-rules"
+      }
+    ]
+  },
+  {
+    "title": "Agent",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "agent"
+      },
+      {
+        "title": "Checks",
+        "path": "agent/check"
+      },
+      {
+        "title": "Services",
+        "path": "agent/service"
+      },
+      {
+        "title": "Connect",
+        "path": "agent/connect"
+      }
+    ]
+  },
+  {
+    "title": "Catalog",
+    "path": "catalog"
+  },
+  {
+    "title": "Config",
+    "path": "config"
+  },
+  {
+    "title": "Connect",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "connect"
+      },
+      {
+        "title": "Certificate Authority (CA)",
+        "path": "connect/ca"
+      },
+      {
+        "title": "Intentions",
+        "path": "connect/intentions"
+      }
+    ]
+  },
+  {
+    "title": "Coordinates",
+    "path": "coordinate"
+  },
+  {
+    "title": "Discovery Chain",
+    "path": "discovery-chain"
+  },
+  {
+    "title": "Events",
+    "path": "event"
+  },
+  {
+    "title": "Health",
+    "path": "health"
+  },
+  {
+    "title": "KV Store",
+    "path": "kv"
+  },
+  {
+    "title": "Operator",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "operator"
+      },
+      {
+        "title": "Area",
+        "path": "operator/area"
+      },
+      {
+        "title": "Autopilot",
+        "path": "operator/autopilot"
+      },
+      {
+        "title": "Keyring",
+        "path": "operator/keyring"
+      },
+      {
+        "title": "License",
+        "path": "operator/license"
+      },
+      {
+        "title": "Raft",
+        "path": "operator/raft"
+      },
+      {
+        "title": "Segment",
+        "path": "operator/segment"
+      }
+    ]
+  },
+  {
+    "title": "Namespaces",
+    "path": "namespaces"
+  },
+  {
+    "title": "Prepared Queries",
+    "path": "query"
+  },
+  {
+    "title": "Sessions",
+    "path": "session"
+  },
+  {
+    "title": "Snapshots",
+    "path": "snapshot"
+  },
+  {
+    "title": "Status",
+    "path": "status"
+  },
+  {
+    "title": "Transactions",
+    "path": "txn"
+  },
+  {
+    "divider": true
+  },
+  {
+    "title": "Libraries &amp; SDKs",
+    "path": "libraries-and-sdks"
+  }
+]
diff --git a/website/data/api-navigation.js b/website/data/api-navigation.js
deleted file mode 100644
index 4e273835f9..0000000000
--- a/website/data/api-navigation.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// The root folder for this documentation category is `pages/guides`
-//
-// - A string refers to the name of a file
-// - A "category" value refers to the name of a directory
-// - All directories must have an "index.mdx" file to serve as
-//   the landing page for the category, or a "name" property to
-//   serve as the category title in the sidebar
-
-export default [
-  'index',
-  {
-    category: 'features',
-    name: 'API Features',
-    content: ['consistency', 'blocking', 'filtering', 'caching'],
-  },
-  '--------',
-  {
-    category: 'acl',
-    content: [
-      'tokens',
-      'legacy',
-      'policies',
-      'roles',
-      'auth-methods',
-      'binding-rules',
-    ],
-  },
-  {
-    category: 'agent',
-    content: ['check', 'service', 'connect'],
-  },
-  'catalog',
-  'config',
-  { category: 'connect', content: ['ca', 'intentions'] },
-  'coordinate',
-  'discovery-chain',
-  'event',
-  'health',
-  'kv',
-  {
-    category: 'operator',
-    content: ['area', 'autopilot', 'keyring', 'license', 'raft', 'segment'],
-  },
-  'namespaces',
-  'query',
-  'session',
-  'snapshot',
-  'status',
-  'txn',
-  '-------',
-  'libraries-and-sdks',
-]
diff --git a/website/data/commands-nav-data.json b/website/data/commands-nav-data.json
new file mode 100644
index 0000000000..329287d52b
--- /dev/null
+++ b/website/data/commands-nav-data.json
@@ -0,0 +1,506 @@
+[
+  {
+    "title": "Commands (CLI)",
+    "path": "index"
+  },
+  {
+    "title": "acl",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "acl"
+      },
+      {
+        "title": "auth-method",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "acl/auth-method"
+          },
+          {
+            "title": "create",
+            "path": "acl/auth-method/create"
+          },
+          {
+            "title": "delete",
+            "path": "acl/auth-method/delete"
+          },
+          {
+            "title": "list",
+            "path": "acl/auth-method/list"
+          },
+          {
+            "title": "read",
+            "path": "acl/auth-method/read"
+          },
+          {
+            "title": "update",
+            "path": "acl/auth-method/update"
+          }
+        ]
+      },
+      {
+        "title": "binding-rule",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "acl/binding-rule"
+          },
+          {
+            "title": "create",
+            "path": "acl/binding-rule/create"
+          },
+          {
+            "title": "delete",
+            "path": "acl/binding-rule/delete"
+          },
+          {
+            "title": "list",
+            "path": "acl/binding-rule/list"
+          },
+          {
+            "title": "read",
+            "path": "acl/binding-rule/read"
+          },
+          {
+            "title": "update",
+            "path": "acl/binding-rule/update"
+          }
+        ]
+      },
+      {
+        "title": "bootstrap",
+        "path": "acl/bootstrap"
+      },
+      {
+        "title": "policy",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "acl/policy"
+          },
+          {
+            "title": "create",
+            "path": "acl/policy/create"
+          },
+          {
+            "title": "delete",
+            "path": "acl/policy/delete"
+          },
+          {
+            "title": "list",
+            "path": "acl/policy/list"
+          },
+          {
+            "title": "read",
+            "path": "acl/policy/read"
+          },
+          {
+            "title": "update",
+            "path": "acl/policy/update"
+          }
+        ]
+      },
+      {
+        "title": "role",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "acl/role"
+          },
+          {
+            "title": "create",
+            "path": "acl/role/create"
+          },
+          {
+            "title": "delete",
+            "path": "acl/role/delete"
+          },
+          {
+            "title": "list",
+            "path": "acl/role/list"
+          },
+          {
+            "title": "read",
+            "path": "acl/role/read"
+          },
+          {
+            "title": "update",
+            "path": "acl/role/update"
+          }
+        ]
+      },
+      {
+        "title": "set-agent-token",
+        "path": "acl/set-agent-token"
+      },
+      {
+        "title": "token",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "acl/token"
+          },
+          {
+            "title": "clone",
+            "path": "acl/token/clone"
+          },
+          {
+            "title": "create",
+            "path": "acl/token/create"
+          },
+          {
+            "title": "delete",
+            "path": "acl/token/delete"
+          },
+          {
+            "title": "list",
+            "path": "acl/token/list"
+          },
+          {
+            "title": "read",
+            "path": "acl/token/read"
+          },
+          {
+            "title": "update",
+            "path": "acl/token/update"
+          }
+        ]
+      },
+      {
+        "title": "translate-rules",
+        "path": "acl/translate-rules"
+      }
+    ]
+  },
+  {
+    "title": "agent",
+    "path": "agent"
+  },
+  {
+    "title": "catalog",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "catalog"
+      },
+      {
+        "title": "datacenters",
+        "path": "catalog/datacenters"
+      },
+      {
+        "title": "nodes",
+        "path": "catalog/nodes"
+      },
+      {
+        "title": "services",
+        "path": "catalog/services"
+      }
+    ]
+  },
+  {
+    "title": "config",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "config"
+      },
+      {
+        "title": "delete",
+        "path": "config/delete"
+      },
+      {
+        "title": "list",
+        "path": "config/list"
+      },
+      {
+        "title": "read",
+        "path": "config/read"
+      },
+      {
+        "title": "write",
+        "path": "config/write"
+      }
+    ]
+  },
+  {
+    "title": "connect",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "connect"
+      },
+      {
+        "title": "ca",
+        "path": "connect/ca"
+      },
+      {
+        "title": "proxy",
+        "path": "connect/proxy"
+      },
+      {
+        "title": "envoy",
+        "path": "connect/envoy"
+      },
+      {
+        "title": "expose",
+        "path": "connect/expose"
+      }
+    ]
+  },
+  {
+    "title": "debug",
+    "path": "debug"
+  },
+  {
+    "title": "event",
+    "path": "event"
+  },
+  {
+    "title": "exec",
+    "path": "exec"
+  },
+  {
+    "title": "force-leave",
+    "path": "force-leave"
+  },
+  {
+    "title": "info",
+    "path": "info"
+  },
+  {
+    "title": "intention",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "intention"
+      },
+      {
+        "title": "check",
+        "path": "intention/check"
+      },
+      {
+        "title": "create",
+        "path": "intention/create"
+      },
+      {
+        "title": "delete",
+        "path": "intention/delete"
+      },
+      {
+        "title": "get",
+        "path": "intention/get"
+      },
+      {
+        "title": "match",
+        "path": "intention/match"
+      }
+    ]
+  },
+  {
+    "title": "join",
+    "path": "join"
+  },
+  {
+    "title": "keygen",
+    "path": "keygen"
+  },
+  {
+    "title": "keyring",
+    "path": "keyring"
+  },
+  {
+    "title": "kv",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "kv"
+      },
+      {
+        "title": "delete",
+        "path": "kv/delete"
+      },
+      {
+        "title": "export",
+        "path": "kv/export"
+      },
+      {
+        "title": "get",
+        "path": "kv/get"
+      },
+      {
+        "title": "import",
+        "path": "kv/import"
+      },
+      {
+        "title": "put",
+        "path": "kv/put"
+      }
+    ]
+  },
+  {
+    "title": "leave",
+    "path": "leave"
+  },
+  {
+    "title": "license",
+    "path": "license"
+  },
+  {
+    "title": "lock",
+    "path": "lock"
+  },
+  {
+    "title": "login",
+    "path": "login"
+  },
+  {
+    "title": "logout",
+    "path": "logout"
+  },
+  {
+    "title": "maint",
+    "path": "maint"
+  },
+  {
+    "title": "members",
+    "path": "members"
+  },
+  {
+    "title": "monitor",
+    "path": "monitor"
+  },
+  {
+    "title": "namespace",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "namespace"
+      },
+      {
+        "title": "create",
+        "path": "namespace/create"
+      },
+      {
+        "title": "delete",
+        "path": "namespace/delete"
+      },
+      {
+        "title": "list",
+        "path": "namespace/list"
+      },
+      {
+        "title": "read",
+        "path": "namespace/read"
+      },
+      {
+        "title": "update",
+        "path": "namespace/update"
+      },
+      {
+        "title": "write",
+        "path": "namespace/write"
+      }
+    ]
+  },
+  {
+    "title": "operator",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "operator"
+      },
+      {
+        "title": "area",
+        "path": "operator/area"
+      },
+      {
+        "title": "autopilot",
+        "path": "operator/autopilot"
+      },
+      {
+        "title": "raft",
+        "path": "operator/raft"
+      }
+    ]
+  },
+  {
+    "title": "reload",
+    "path": "reload"
+  },
+  {
+    "title": "rtt",
+    "path": "rtt"
+  },
+  {
+    "title": "services",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "services"
+      },
+      {
+        "title": "register",
+        "path": "services/register"
+      },
+      {
+        "title": "deregister",
+        "path": "services/deregister"
+      }
+    ]
+  },
+  {
+    "title": "snapshot",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "snapshot"
+      },
+      {
+        "title": "agent",
+        "path": "snapshot/agent"
+      },
+      {
+        "title": "inspect",
+        "path": "snapshot/inspect"
+      },
+      {
+        "title": "restore",
+        "path": "snapshot/restore"
+      },
+      {
+        "title": "save",
+        "path": "snapshot/save"
+      }
+    ]
+  },
+  {
+    "title": "tls",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "tls"
+      },
+      {
+        "title": "ca",
+        "path": "tls/ca"
+      },
+      {
+        "title": "cert",
+        "path": "tls/cert"
+      }
+    ]
+  },
+  {
+    "title": "validate",
+    "path": "validate"
+  },
+  {
+    "title": "version",
+    "path": "version"
+  },
+  {
+    "title": "watch",
+    "path": "watch"
+  }
+]
diff --git a/website/data/commands-navigation.js b/website/data/commands-navigation.js
deleted file mode 100644
index 57ed8427f6..0000000000
--- a/website/data/commands-navigation.js
+++ /dev/null
@@ -1,78 +0,0 @@
-export default [
-  'index',
-  {
-    category: 'acl',
-    content: [
-      {
-        category: 'auth-method',
-        content: ['create', 'delete', 'list', 'read', 'update'],
-      },
-      {
-        category: 'binding-rule',
-        content: ['create', 'delete', 'list', 'read', 'update'],
-      },
-      'bootstrap',
-      {
-        category: 'policy',
-        content: ['create', 'delete', 'list', 'read', 'update'],
-      },
-      {
-        category: 'role',
-        content: ['create', 'delete', 'list', 'read', 'update'],
-      },
-      'set-agent-token',
-      {
-        category: 'token',
-        content: ['clone', 'create', 'delete', 'list', 'read', 'update'],
-      },
-      'translate-rules',
-    ],
-  },
-  'agent',
-  { category: 'catalog', content: ['datacenters', 'nodes', 'services'] },
-  { category: 'config', content: ['delete', 'list', 'read', 'write'] },
-  { category: 'connect', content: ['ca', 'proxy', 'envoy', 'expose'] },
-  'debug',
-  'event',
-  'exec',
-  'force-leave',
-  'info',
-  {
-    category: 'intention',
-    content: ['check', 'create', 'delete', 'get', 'match'],
-  },
-  'join',
-  'keygen',
-  'keyring',
-  {
-    category: 'kv',
-    content: ['delete', 'export', 'get', 'import', 'put'],
-  },
-  'leave',
-  'license',
-  'lock',
-  'login',
-  'logout',
-  'maint',
-  'members',
-  'monitor',
-  {
-    category: 'namespace',
-    content: ['create', 'delete', 'list', 'read', 'update', 'write'],
-  },
-  {
-    category: 'operator',
-    content: ['area', 'autopilot', 'raft'],
-  },
-  'reload',
-  'rtt',
-  { category: 'services', content: ['register', 'deregister'] },
-  {
-    category: 'snapshot',
-    content: ['agent', 'inspect', 'restore', 'save'],
-  },
-  { category: 'tls', content: ['ca', 'cert'] },
-  'validate',
-  'version',
-  'watch',
-]
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
new file mode 100644
index 0000000000..e76581354c
--- /dev/null
+++ b/website/data/docs-nav-data.json
@@ -0,0 +1,892 @@
+[
+  {
+    "title": "Intro to Consul",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "intro"
+      },
+      {
+        "title": "Consul vs. Other Software",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "intro/vs"
+          },
+          {
+            "title": "ZooKeeper, doozerd, etcd",
+            "path": "intro/vs/zookeeper"
+          },
+          {
+            "title": "Chef, Puppet, etc.",
+            "path": "intro/vs/chef-puppet"
+          },
+          {
+            "title": "Nagios",
+            "path": "intro/vs/nagios"
+          },
+          {
+            "title": "SkyDNS",
+            "path": "intro/vs/skydns"
+          },
+          {
+            "title": "SmartStack",
+            "path": "intro/vs/smartstack"
+          },
+          {
+            "title": "Serf",
+            "path": "intro/vs/serf"
+          },
+          {
+            "title": "Eureka",
+            "path": "intro/vs/eureka"
+          },
+          {
+            "title": "Istio",
+            "path": "intro/vs/istio"
+          },
+          {
+            "title": "Envoy and Other Proxies",
+            "path": "intro/vs/proxies"
+          },
+          {
+            "title": "Custom Solutions",
+            "path": "intro/vs/custom"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "title": "Get Started",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "install"
+      },
+      {
+        "title": "Consul Agent",
+        "href": "/docs/agent"
+      },
+      {
+        "title": "Glossary",
+        "path": "install/glossary"
+      },
+      {
+        "title": "Required Ports",
+        "path": "install/ports"
+      },
+      {
+        "title": "Bootstrapping a Datacenter",
+        "path": "install/bootstrapping"
+      },
+      {
+        "title": "Cloud Auto-join",
+        "path": "install/cloud-auto-join"
+      },
+      {
+        "title": "Server Performance",
+        "path": "install/performance"
+      },
+      {
+        "title": "Kubernetes",
+        "href": "/docs/k8s"
+      }
+    ]
+  },
+  {
+    "title": "API",
+    "href": "/api-docs"
+  },
+  {
+    "title": "Commands (CLI)",
+    "href": "/commands"
+  },
+  {
+    "title": "Service Discovery",
+    "routes": [
+      {
+        "title": "Register Services - Service Definitions",
+        "path": "discovery/services"
+      },
+      {
+        "title": "Find Services - DNS Interface",
+        "path": "discovery/dns"
+      },
+      {
+        "title": "Monitor Services - Check Definitions",
+        "path": "discovery/checks"
+      }
+    ]
+  },
+  {
+    "title": "Service Mesh",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "connect"
+      },
+      {
+        "title": "How Connect Works",
+        "path": "connect/connect-internals"
+      },
+      {
+        "title": "Configuration",
+        "path": "connect/configuration"
+      },
+      {
+        "title": "Configuration Entries",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "connect/config-entries"
+          },
+          {
+            "title": "Ingress Gateway",
+            "path": "connect/config-entries/ingress-gateway"
+          },
+          {
+            "title": "Proxy Defaults",
+            "path": "connect/config-entries/proxy-defaults"
+          },
+          {
+            "title": "Service Defaults",
+            "path": "connect/config-entries/service-defaults"
+          },
+          {
+            "title": "Service Intentions",
+            "path": "connect/config-entries/service-intentions"
+          },
+          {
+            "title": "Service Resolver",
+            "path": "connect/config-entries/service-resolver"
+          },
+          {
+            "title": "Service Router",
+            "path": "connect/config-entries/service-router"
+          },
+          {
+            "title": "Service Splitter",
+            "path": "connect/config-entries/service-splitter"
+          },
+          {
+            "title": "Terminating Gateway",
+            "path": "connect/config-entries/terminating-gateway"
+          }
+        ]
+      },
+      {
+        "title": "Supported Proxies",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "connect/proxies"
+          },
+          {
+            "title": "Envoy",
+            "path": "connect/proxies/envoy"
+          },
+          {
+            "title": "Built-in Proxy",
+            "path": "connect/proxies/built-in"
+          },
+          {
+            "title": "Proxy Integration",
+            "path": "connect/proxies/integrate"
+          }
+        ]
+      },
+      {
+        "title": "Registering Proxies",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "connect/registration"
+          },
+          {
+            "title": "Proxy Service Registration",
+            "path": "connect/registration/service-registration"
+          },
+          {
+            "title": "Sidecar Service Registration",
+            "path": "connect/registration/sidecar-service"
+          }
+        ]
+      },
+      {
+        "title": "Service-to-service permissions - Intentions",
+        "path": "connect/intentions"
+      },
+      {
+        "title": "Service-to-service permissions - Intentions (Legacy Mode)",
+        "path": "connect/intentions-legacy"
+      },
+      {
+        "title": "Observability",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "connect/observability"
+          },
+          {
+            "title": "UI Visualization",
+            "path": "connect/observability/ui-visualization"
+          }
+        ]
+      },
+      {
+        "title": "L7 Traffic Management",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "connect/l7-traffic"
+          },
+          {
+            "title": "Discovery Chain",
+            "path": "connect/l7-traffic/discovery-chain"
+          }
+        ]
+      },
+      {
+        "title": "Connectivity Tasks",
+        "path": "connect/connectivity-tasks"
+      },
+      {
+        "title": "Gateways",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "connect/gateways"
+          },
+          {
+            "title": "Connect Datacenters - Mesh Gateways",
+            "routes": [
+              {
+                "title": "Overview",
+                "path": "connect/gateways/mesh-gateway"
+              },
+              {
+                "title": "WAN Federation",
+                "path": "connect/gateways/mesh-gateway/wan-federation-via-mesh-gateways"
+              }
+            ]
+          },
+          {
+            "title": "External <> Internal Services -  Ingress Gateways",
+            "path": "connect/gateways/ingress-gateway"
+          },
+          {
+            "title": "Internal <> External Services - Terminating Gateways",
+            "path": "connect/gateways/terminating-gateway"
+          }
+        ]
+      },
+      {
+        "title": "Nomad",
+        "path": "connect/nomad"
+      },
+      {
+        "title": "Kubernetes",
+        "href": "/docs/k8s/connect"
+      },
+      {
+        "title": "Native App Integration",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "connect/native"
+          },
+          {
+            "title": "Go Integration",
+            "path": "connect/native/go"
+          }
+        ]
+      },
+      {
+        "title": "Certificate Management",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "connect/ca"
+          },
+          {
+            "title": "Built-In CA",
+            "path": "connect/ca/consul"
+          },
+          {
+            "title": "Vault",
+            "path": "connect/ca/vault"
+          },
+          {
+            "title": "ACM Private CA",
+            "path": "connect/ca/aws"
+          }
+        ]
+      },
+      {
+        "title": "Develop and Debug",
+        "path": "connect/dev"
+      }
+    ]
+  },
+  {
+    "title": "Kubernetes",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "k8s"
+      },
+      {
+        "title": "Get Started",
+        "routes": [
+          {
+            "title": "Install with Helm Chart",
+            "path": "k8s/installation/install"
+          },
+          {
+            "title": "Platform Guides",
+            "routes": [
+              {
+                "title": "Minikube",
+                "href": "https://learn.hashicorp.com/tutorials/consul/kubernetes-minikube?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=mk"
+              },
+              {
+                "title": "Kind",
+                "href": "https://learn.hashicorp.com/tutorials/consul/kubernetes-kind?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=kind"
+              },
+              {
+                "title": "AKS (Azure)",
+                "href": "https://learn.hashicorp.com/tutorials/consul/kubernetes-aks-azure?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=aks"
+              },
+              {
+                "title": "EKS (AWS)",
+                "href": "https://learn.hashicorp.com/tutorials/consul/kubernetes-eks-aws?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=eks"
+              },
+              {
+                "title": "GKE (Google Cloud)",
+                "href": "https://learn.hashicorp.com/tutorials/consul/kubernetes-gke-google?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=gke"
+              },
+              {
+                "title": "Red Hat OpenShift",
+                "href": "https://learn.hashicorp.com/tutorials/consul/kubernetes-openshift-red-hat?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=openshift"
+              },
+              {
+                "title": "Self Hosted Kubernetes",
+                "path": "k8s/installation/platforms/self-hosted-kubernetes"
+              }
+            ]
+          },
+          {
+            "title": "Deployment Configurations",
+            "routes": [
+              {
+                "title": "Consul Clients Outside Kubernetes",
+                "path": "k8s/installation/deployment-configurations/clients-outside-kubernetes"
+              },
+              {
+                "title": "Consul Servers Outside Kubernetes",
+                "path": "k8s/installation/deployment-configurations/servers-outside-kubernetes"
+              },
+              {
+                "title": "Consul Enterprise",
+                "path": "k8s/installation/deployment-configurations/consul-enterprise"
+              }
+            ]
+          },
+          {
+            "title": "Multi-Cluster Federation",
+            "routes": [
+              {
+                "title": "Overview",
+                "path": "k8s/installation/multi-cluster"
+              },
+              {
+                "title": "Federation Between Kubernetes Clusters",
+                "path": "k8s/installation/multi-cluster/kubernetes"
+              },
+              {
+                "title": "Federation Between VMs and Kubernetes",
+                "path": "k8s/installation/multi-cluster/vms-and-kubernetes"
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "title": "Service Mesh",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "k8s/connect"
+          },
+          {
+            "title": "Ingress Gateways",
+            "path": "k8s/connect/ingress-gateways"
+          },
+          {
+            "title": "Terminating Gateways",
+            "path": "k8s/connect/terminating-gateways"
+          },
+          {
+            "title": "Configuring a Connect CA Provider",
+            "path": "k8s/connect/connect-ca-provider"
+          },
+          {
+            "title": "Ambassador Integration",
+            "path": "k8s/connect/ambassador"
+          },
+          {
+            "title": "Health Checks",
+            "path": "k8s/connect/health"
+          },
+          {
+            "title": "Observability",
+            "routes": [
+              {
+                "title": "Metrics",
+                "path": "k8s/connect/observability/metrics"
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "title": "Service Sync",
+        "path": "k8s/service-sync"
+      },
+      {
+        "title": "Custom Resource Definitions",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "k8s/crds"
+          },
+          {
+            "title": "Upgrade An Existing Cluster to CRDs",
+            "path": "k8s/crds/upgrade-to-crds"
+          }
+        ]
+      },
+      {
+        "title": "Consul DNS",
+        "path": "k8s/dns"
+      },
+      {
+        "title": "Upgrade",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "k8s/upgrade"
+          },
+          {
+            "title": "Compatibility Matrix",
+            "path": "k8s/upgrade/compatibility"
+          }
+        ]
+      },
+      {
+        "title": "Operations",
+        "routes": [
+          {
+            "title": "Uninstall",
+            "path": "k8s/operations/uninstall"
+          },
+          {
+            "title": "Certificate Rotation",
+            "path": "k8s/operations/certificate-rotation"
+          },
+          {
+            "title": "Configure TLS on an Existing Cluster",
+            "path": "k8s/operations/tls-on-existing-cluster"
+          }
+        ]
+      },
+      {
+        "title": "Troubleshoot",
+        "routes": [
+          {
+            "title": "Common Error Messages",
+            "href": "/docs/troubleshoot/common-errors#common-errors-on-kubernetes"
+          },
+          {
+            "title": "FAQ",
+            "href": "/docs/troubleshoot/faq#consul-on-kubernetes"
+          }
+        ]
+      },
+      {
+        "title": "Helm Chart Configuration",
+        "path": "k8s/helm"
+      }
+    ]
+  },
+  {
+    "title": "Network Infrastructure Automation",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "nia"
+      },
+      {
+        "title": "Get Started",
+        "routes": [
+          {
+            "title": "Installation",
+            "path": "nia/installation/install"
+          },
+          {
+            "title": "Requirements",
+            "path": "nia/installation/requirements"
+          },
+          {
+            "title": "Configure",
+            "path": "nia/installation/configure"
+          },
+          {
+            "title": "Run Consul-Terraform-Sync",
+            "path": "nia/installation/run"
+          }
+        ]
+      },
+      {
+        "title": "Architecture",
+        "path": "nia/architecture"
+      },
+      {
+        "title": "API",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "nia/api/api-overview"
+          },
+          {
+            "title": "Status",
+            "path": "nia/api/status"
+          },
+          {
+            "title": "Tasks",
+            "path": "nia/api/tasks"
+          }
+        ]
+      },
+      {
+        "title": "CLI",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "nia/cli/cli-overview"
+          },
+          {
+            "title": "task",
+            "path": "nia/cli/task"
+          }
+        ]
+      },
+      {
+        "title": "Configuration",
+        "path": "nia/configuration"
+      },
+      {
+        "title": "Tasks",
+        "path": "nia/tasks"
+      },
+      {
+        "title": "Terraform Modules",
+        "path": "nia/terraform-modules"
+      },
+      {
+        "title": "Network Drivers",
+        "path": "nia/network-drivers"
+      },
+      {
+        "title": "Compatibility",
+        "path": "nia/compatibility"
+      }
+    ]
+  },
+  {
+    "title": "Dynamic App Configuration",
+    "routes": [
+      {
+        "title": "Consul KV",
+        "path": "dynamic-app-config/kv"
+      },
+      {
+        "title": "Sessions",
+        "path": "dynamic-app-config/sessions"
+      },
+      {
+        "title": "Watches",
+        "path": "dynamic-app-config/watches"
+      }
+    ]
+  },
+  {
+    "title": "Agent",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "agent"
+      },
+      {
+        "title": "Configuration",
+        "path": "agent/options"
+      },
+      {
+        "title": "Configuration Entries",
+        "path": "agent/config-entries"
+      },
+      {
+        "title": "Telemetry",
+        "path": "agent/telemetry"
+      }
+    ]
+  },
+  {
+    "title": "Security",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "security"
+      },
+      {
+        "title": "Access Control (ACLs)",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "security/acl"
+          },
+          {
+            "title": "ACL System",
+            "path": "security/acl/acl-system"
+          },
+          {
+            "title": "ACL Rules",
+            "path": "security/acl/acl-rules"
+          },
+          {
+            "title": "Legacy Mode",
+            "path": "security/acl/acl-legacy"
+          },
+          {
+            "title": "Token Migration",
+            "path": "security/acl/acl-migrate-tokens"
+          },
+          {
+            "title": "Auth Methods",
+            "routes": [
+              {
+                "title": "Overview",
+                "path": "security/acl/auth-methods"
+              },
+              {
+                "title": "Kubernetes",
+                "path": "security/acl/auth-methods/kubernetes"
+              },
+              {
+                "title": "JWT",
+                "path": "security/acl/auth-methods/jwt"
+              },
+              {
+                "title": "OIDC",
+                "path": "security/acl/auth-methods/oidc"
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "title": "Encryption",
+        "path": "security/encryption"
+      },
+      {
+        "title": "Security Models",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "security/security-models"
+          },
+          {
+            "title": "Core",
+            "path": "security/security-models/core"
+          },
+          {
+            "title": "Network Infrastructure Automation",
+            "path": "security/security-models/nia"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "title": "Enterprise Features",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "enterprise"
+      },
+      {
+        "title": "Audit Logging",
+        "path": "enterprise/audit-logging"
+      },
+      {
+        "title": "Automated Backups",
+        "path": "enterprise/backups"
+      },
+      {
+        "title": "Automated Upgrades",
+        "path": "enterprise/upgrades"
+      },
+      {
+        "title": "Enhanced Read Scalability",
+        "path": "enterprise/read-scale"
+      },
+      {
+        "title": "Single sign-on - OIDC",
+        "href": "/docs/security/acl/auth-methods/oidc"
+      },
+      {
+        "title": "Redundancy Zones",
+        "path": "enterprise/redundancy"
+      },
+      {
+        "title": "Advanced Federation",
+        "path": "enterprise/federation"
+      },
+      {
+        "title": "Namespaces",
+        "path": "enterprise/namespaces"
+      },
+      {
+        "title": "Network Segments",
+        "path": "enterprise/network-segments"
+      },
+      {
+        "title": "Sentinel",
+        "path": "enterprise/sentinel"
+      }
+    ]
+  },
+  {
+    "title": "Architecture",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "architecture"
+      },
+      {
+        "title": "Anti-Entropy",
+        "path": "architecture/anti-entropy"
+      },
+      {
+        "title": "Consensus Protocol",
+        "path": "architecture/consensus"
+      },
+      {
+        "title": "Gossip Protocol",
+        "path": "architecture/gossip"
+      },
+      {
+        "title": "Jepsen Testing",
+        "path": "architecture/jepsen"
+      },
+      {
+        "title": "Network Coordinates",
+        "path": "architecture/coordinates"
+      }
+    ]
+  },
+  {
+    "title": "Integrations",
+    "routes": [
+      {
+        "title": "Consul Integration Program",
+        "path": "integrate/partnerships"
+      },
+      {
+        "title": "NIA Integration Program",
+        "path": "integrate/nia-integration"
+      },
+      {
+        "title": "Vault Integration",
+        "href": "/docs/connect/ca/vault"
+      },
+      {
+        "title": "Ambassador Integration",
+        "href": "/docs/k8s/connect/ambassador"
+      },
+      {
+        "title": "Proxy Integration",
+        "href": "/docs/connect/proxies/integrate"
+      }
+    ]
+  },
+  {
+    "title": "Consul Tools",
+    "path": "download-tools"
+  },
+  {
+    "title": "Upgrade",
+    "routes": [
+      {
+        "title": "Overview",
+        "path": "upgrading"
+      },
+      {
+        "title": "Compatibility Promise",
+        "path": "upgrading/compatibility"
+      },
+      {
+        "title": "Specific Version Details",
+        "path": "upgrading/upgrade-specific"
+      },
+      {
+        "title": "Upgrade Instructions",
+        "routes": [
+          {
+            "title": "Overview",
+            "path": "upgrading/instructions"
+          },
+          {
+            "title": "General Process",
+            "path": "upgrading/instructions/general-process"
+          },
+          {
+            "title": "Upgrading to 1.2.4",
+            "path": "upgrading/instructions/upgrade-to-1-2-x"
+          },
+          {
+            "title": "Upgrading to 1.6.9",
+            "path": "upgrading/instructions/upgrade-to-1-6-x"
+          },
+          {
+            "title": "Upgrading to 1.8.4",
+            "path": "upgrading/instructions/upgrade-to-1-8-x"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "title": "Troubleshoot",
+    "routes": [
+      {
+        "title": "Common Error Messages",
+        "path": "troubleshoot/common-errors"
+      },
+      {
+        "title": "FAQ",
+        "path": "troubleshoot/faq"
+      }
+    ]
+  },
+  {
+    "title": "Release Notes",
+    "routes": [
+      {
+        "title": "1.9.0",
+        "path": "release-notes/1-9-0"
+      }
+    ]
+  }
+]
diff --git a/website/data/docs-navigation.js b/website/data/docs-navigation.js
deleted file mode 100644
index b834fbaa1a..0000000000
--- a/website/data/docs-navigation.js
+++ /dev/null
@@ -1,342 +0,0 @@
-// The root folder for this documentation category is `pages/docs`
-//
-// - A string refers to the name of a file
-// - A "category" value refers to the name of a directory
-// - All directories must have an "index.mdx" file to serve as
-//   the landing page for the category, or a "name" property to
-//   serve as the category title in the sidebar
-
-export default [
-  {
-    category: 'intro',
-    content: [
-      {
-        category: 'vs',
-        content: [
-          'zookeeper',
-          'chef-puppet',
-          'nagios',
-          'skydns',
-          'smartstack',
-          'serf',
-          'eureka',
-          'istio',
-          'proxies',
-          'custom',
-        ],
-      },
-    ],
-  },
-
-  {
-    category: 'install',
-    content: [
-      { title: 'Consul Agent', href: '/docs/agent' },
-      'glossary',
-      'ports',
-      'bootstrapping',
-      'cloud-auto-join',
-      'performance',
-      { title: 'Kubernetes', href: '/docs/k8s' },
-    ],
-  },
-
-  { title: 'API', href: '/api-docs' },
-
-  { title: 'Commands (CLI)', href: '/commands' },
-
-  {
-    category: 'discovery',
-    name: 'Service Discovery',
-    content: ['services', 'dns', 'checks'],
-  },
-
-  {
-    category: 'connect',
-    content: [
-      'connect-internals',
-      'configuration',
-      {
-        category: 'config-entries',
-        content: [
-          'ingress-gateway',
-          'proxy-defaults',
-          'service-defaults',
-          'service-intentions',
-          'service-resolver',
-          'service-router',
-          'service-splitter',
-          'terminating-gateway',
-        ],
-      },
-      {
-        category: 'proxies',
-        content: ['envoy', 'built-in', 'integrate'],
-      },
-      {
-        category: 'registration',
-        content: ['service-registration', 'sidecar-service'],
-      },
-      'intentions',
-      'intentions-legacy',
-      {
-        category: 'observability',
-        content: ['ui-visualization'],
-      },
-      {
-        category: 'l7-traffic',
-        content: ['discovery-chain'],
-      },
-      'connectivity-tasks',
-      {
-        category: 'gateways',
-        content: [
-          {
-            category: 'mesh-gateway',
-            content: ['wan-federation-via-mesh-gateways'],
-          },
-
-          'ingress-gateway',
-          'terminating-gateway',
-        ],
-      },
-      'nomad',
-      { title: 'Kubernetes', href: '/docs/k8s/connect' },
-      { category: 'native', content: ['go'] },
-      {
-        category: 'ca',
-        content: ['consul', 'vault', 'aws'],
-      },
-      'dev',
-    ],
-  },
-  {
-    category: 'k8s',
-    content: [
-      {
-        category: 'installation',
-        name: 'Get Started',
-        content: [
-          'install',
-          {
-            category: 'platforms',
-            name: 'Platform Guides',
-            content: [
-              {
-                title: 'Minikube',
-                href:
-                  'https://learn.hashicorp.com/tutorials/consul/kubernetes-minikube?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=mk',
-              },
-              {
-                title: 'Kind',
-                href:
-                  'https://learn.hashicorp.com/tutorials/consul/kubernetes-kind?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=kind',
-              },
-              {
-                title: 'AKS (Azure)',
-                href:
-                  'https://learn.hashicorp.com/tutorials/consul/kubernetes-aks-azure?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=aks',
-              },
-              {
-                title: 'EKS (AWS)',
-                href:
-                  'https://learn.hashicorp.com/tutorials/consul/kubernetes-eks-aws?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=eks',
-              },
-              {
-                title: 'GKE (Google Cloud)',
-                href:
-                  'https://learn.hashicorp.com/tutorials/consul/kubernetes-gke-google?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=gke',
-              },
-              {
-                title: 'Red Hat OpenShift',
-                href:
-                  'https://learn.hashicorp.com/tutorials/consul/kubernetes-openshift-red-hat?utm_source=consul.io&utm_medium=docs&utm_content=k8s&utm_term=openshift',
-              },
-              'self-hosted-kubernetes',
-            ],
-          },
-          {
-            category: 'deployment-configurations',
-            name: 'Deployment Configurations',
-            content: [
-              'clients-outside-kubernetes',
-              'servers-outside-kubernetes',
-              'consul-enterprise',
-            ],
-          },
-          {
-            category: 'multi-cluster',
-            content: ['kubernetes', 'vms-and-kubernetes'],
-          },
-        ],
-      },
-      {
-        category: 'connect',
-        content: [
-          'ingress-gateways',
-          'terminating-gateways',
-          'connect-ca-provider',
-          'ambassador',
-          'health',
-          { category: 'observability', content: ['metrics'], name: "Observability" },
-        ],
-      },
-      'service-sync',
-      {
-        category: 'crds',
-        content: ['upgrade-to-crds'],
-      },
-      'dns',
-      {
-        category: 'upgrade',
-        content: ['compatibility'],
-      },
-      {
-        category: 'operations',
-        name: 'Operations',
-        content: ['uninstall', 'certificate-rotation', 'tls-on-existing-cluster'],
-      },
-      {
-        name: 'Troubleshoot',
-        content: [
-          {
-            title: 'Common Error Messages',
-            href:
-              '/docs/troubleshoot/common-errors#common-errors-on-kubernetes',
-          },
-          {
-            title: 'FAQ',
-            href: '/docs/troubleshoot/faq#consul-on-kubernetes',
-          },
-        ],
-      },
-      'helm',
-    ],
-  },
-
-  {
-    category: 'nia',
-    content: [
-      {
-        category: 'installation',
-        name: 'Get Started',
-        content: ['install', 'requirements', 'configure', 'run'],
-      },
-      'architecture',
-      {
-        category: 'api',
-        name: 'API',
-        content: ['api-overview', 'status', 'tasks'],
-      },
-      {
-        category: 'cli',
-        name: 'CLI',
-        content: ['cli-overview', 'task'],
-      },
-      'configuration',
-      'tasks',
-      'terraform-modules',
-      'network-drivers',
-      'compatibility',
-    ],
-  },
-
-  {
-    category: 'dynamic-app-config',
-    name: 'Dynamic App Configuration',
-    content: ['kv', 'sessions', 'watches'],
-  },
-  {
-    category: 'agent',
-    content: ['options', 'config-entries', 'telemetry'],
-  },
-  {
-    category: 'security',
-    content: [
-      {
-        category: 'acl',
-        content: [
-          'acl-system',
-          'acl-rules',
-          'acl-legacy',
-          'acl-migrate-tokens',
-          { category: 'auth-methods', content: ['kubernetes', 'jwt', 'oidc'] },
-        ],
-      },
-      'encryption',
-      {
-        category: 'security-models',
-        content: ['core', 'nia'],
-      },
-    ],
-  },
-  {
-    category: 'enterprise',
-    content: [
-      'audit-logging',
-      'backups',
-      'upgrades',
-      'read-scale',
-      {
-        title: 'Single sign-on - OIDC',
-        href: '/docs/security/acl/auth-methods/oidc',
-      },
-      'redundancy',
-      'federation',
-      'namespaces',
-      'network-segments',
-      'sentinel',
-    ],
-  },
-  {
-    category: 'architecture',
-    content: ['anti-entropy', 'consensus', 'gossip', 'jepsen', 'coordinates'],
-  },
-  {
-    category: 'integrate',
-    name: 'Integrations',
-    content: [
-      'partnerships',
-      'nia-integration',
-      {
-        title: 'Vault Integration',
-        href: '/docs/connect/ca/vault',
-      },
-      {
-        title: 'Ambassador Integration',
-        href: '/docs/k8s/connect/ambassador',
-      },
-      {
-        title: 'Proxy Integration',
-        href: '/docs/connect/proxies/integrate',
-      },
-    ],
-  },
-  'download-tools',
-  {
-    category: 'upgrading',
-    content: [
-      'compatibility',
-      'upgrade-specific',
-      {
-        category: 'instructions',
-        content: [
-          'general-process',
-          'upgrade-to-1-2-x',
-          'upgrade-to-1-6-x',
-          'upgrade-to-1-8-x',
-        ],
-      },
-    ],
-  },
-  {
-    category: 'troubleshoot',
-    name: 'Troubleshoot',
-    content: ['common-errors', 'faq'],
-  },
-  {
-    category: 'release-notes',
-    name: 'Release Notes',
-    content: ['1-9-0'],
-  },
-]
diff --git a/website/data/intro-navigation.js b/website/data/intro-navigation.js
deleted file mode 100644
index 761c488cf1..0000000000
--- a/website/data/intro-navigation.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// The root folder for this documentation category is `pages/intro`
-//
-// - A string refers to the name of a file
-// - A "category" value refers to the name of a directory
-// - All directories must have an "index.mdx" file to serve as
-//   the landing page for the category, or a "name" property to
-//   serve as the category title in the sidebar
-
-export default ['getting-started']
diff --git a/website/package-lock.json b/website/package-lock.json
index fac57cb0b6..fed64eb776 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -5,118 +5,118 @@
   "requires": true,
   "dependencies": {
     "@algolia/cache-browser-local-storage": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.8.3.tgz",
-      "integrity": "sha512-Cwc03hikHSUI+xvgUdN+H+f6jFyoDsC9fegzXzJ2nPn1YSN9EXzDMBnbrgl0sbl9iLGXe0EIGMYqR2giCv1wMQ==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.8.6.tgz",
+      "integrity": "sha512-Bam7otzjIEgrRXWmk0Amm1+B3ROI5dQnUfJEBjIy0YPM0kMahEoJXCw6160tGKxJLl1g6icoC953nGshQKO7cA==",
       "requires": {
-        "@algolia/cache-common": "4.8.3"
+        "@algolia/cache-common": "4.8.6"
       }
     },
     "@algolia/cache-common": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.8.3.tgz",
-      "integrity": "sha512-Cf7zZ2i6H+tLSBTkFePHhYvlgc9fnMPKsF9qTmiU38kFIGORy/TN2Fx5n1GBuRLIzaSXvcf+oHv1HvU0u1gE1g=="
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/cache-common/-/cache-common-4.8.6.tgz",
+      "integrity": "sha512-eGQlsXU5G7n4RvV/K6qe6lRAeL6EKAYPT3yZDBjCW4pAh7JWta+77a7BwUQkTqXN1MEQWZXjex3E4z/vFpzNrg=="
     },
     "@algolia/cache-in-memory": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.8.3.tgz",
-      "integrity": "sha512-+N7tkvmijXiDy2E7u1mM73AGEgGPWFmEmPeJS96oT46I98KXAwVPNYbcAqBE79YlixdXpkYJk41cFcORzNh+Iw==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/cache-in-memory/-/cache-in-memory-4.8.6.tgz",
+      "integrity": "sha512-kbJrvCFANxL/l5Pq1NFyHLRphKDwmqcD/OJga0IbNKEulRGDPkt1+pC7/q8d2ikP12adBjLLg2CVias9RJpIaw==",
       "requires": {
-        "@algolia/cache-common": "4.8.3"
+        "@algolia/cache-common": "4.8.6"
       }
     },
     "@algolia/client-account": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.8.3.tgz",
-      "integrity": "sha512-Uku8LqnXBwfDCtsTCDYTUOz2/2oqcAQCKgaO0uGdIR8DTQENBXFQvzziambHdn9KuFuY+6Et9k1+cjpTPBDTBg==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/client-account/-/client-account-4.8.6.tgz",
+      "integrity": "sha512-FQVJE/BgCb78jtG7V0r30sMl9P5JKsrsOacGtGF2YebqI0YF25y8Z1nO39lbdjahxUS3QkDw2d0P2EVMj65g2Q==",
       "requires": {
-        "@algolia/client-common": "4.8.3",
-        "@algolia/client-search": "4.8.3",
-        "@algolia/transporter": "4.8.3"
+        "@algolia/client-common": "4.8.6",
+        "@algolia/client-search": "4.8.6",
+        "@algolia/transporter": "4.8.6"
       }
     },
     "@algolia/client-analytics": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.8.3.tgz",
-      "integrity": "sha512-9ensIWmjYJprZ+YjAVSZdWUG05xEnbytENXp508X59tf34IMIX8BR2xl0RjAQODtxBdAteGxuKt5THX6U9tQLA==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-4.8.6.tgz",
+      "integrity": "sha512-ZBYFUlzNaWDFtt0rYHI7xbfVX0lPWU9lcEEXI/BlnkRgEkm247H503tNatPQFA1YGkob52EU18sV1eJ+OFRBLA==",
       "requires": {
-        "@algolia/client-common": "4.8.3",
-        "@algolia/client-search": "4.8.3",
-        "@algolia/requester-common": "4.8.3",
-        "@algolia/transporter": "4.8.3"
+        "@algolia/client-common": "4.8.6",
+        "@algolia/client-search": "4.8.6",
+        "@algolia/requester-common": "4.8.6",
+        "@algolia/transporter": "4.8.6"
       }
     },
     "@algolia/client-common": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.8.3.tgz",
-      "integrity": "sha512-TU3623AEFAWUQlDTznkgAMSYo8lfS9pNs5QYDQzkvzWdqK0GBDWthwdRfo9iIsfxiR9qdCMHqwEu+AlZMVhNSA==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-4.8.6.tgz",
+      "integrity": "sha512-8dI+K3Nvbes2YRZm2LY7bdCUD05e60BhacrMLxFuKxnBGuNehME1wbxq/QxcG1iNFJlxLIze5TxIcNN3+pn76g==",
       "requires": {
-        "@algolia/requester-common": "4.8.3",
-        "@algolia/transporter": "4.8.3"
+        "@algolia/requester-common": "4.8.6",
+        "@algolia/transporter": "4.8.6"
       }
     },
     "@algolia/client-recommendation": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/client-recommendation/-/client-recommendation-4.8.3.tgz",
-      "integrity": "sha512-qysGbmkcc6Agt29E38KWJq9JuxjGsyEYoKuX9K+P5HyQh08yR/BlRYrA8mB7vT/OIUHRGFToGO6Vq/rcg0NIOQ==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/client-recommendation/-/client-recommendation-4.8.6.tgz",
+      "integrity": "sha512-Kg8DpjwvaWWujNx6sAUrSL+NTHxFe/UNaliCcSKaMhd3+FiPXN+CrSkO0KWR7I+oK2qGBTG/2Y0BhFOJ5/B/RA==",
       "requires": {
-        "@algolia/client-common": "4.8.3",
-        "@algolia/requester-common": "4.8.3",
-        "@algolia/transporter": "4.8.3"
+        "@algolia/client-common": "4.8.6",
+        "@algolia/requester-common": "4.8.6",
+        "@algolia/transporter": "4.8.6"
       }
     },
     "@algolia/client-search": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.8.3.tgz",
-      "integrity": "sha512-rAnvoy3GAhbzOQVniFcKVn1eM2NX77LearzYNCbtFrFYavG+hJI187bNVmajToiuGZ10FfJvK99X2OB1AzzezQ==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-4.8.6.tgz",
+      "integrity": "sha512-vXLS6umL/9G3bwqc6pkrS9K5/s8coq55mpfRARL+bs0NsToOf77WSTdwzlxv/KdbVF7dHjXgUpBvJ6RyR4ZdAw==",
       "requires": {
-        "@algolia/client-common": "4.8.3",
-        "@algolia/requester-common": "4.8.3",
-        "@algolia/transporter": "4.8.3"
+        "@algolia/client-common": "4.8.6",
+        "@algolia/requester-common": "4.8.6",
+        "@algolia/transporter": "4.8.6"
       }
     },
     "@algolia/logger-common": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.8.3.tgz",
-      "integrity": "sha512-03wksHRbhl2DouEKnqWuUb64s1lV6kDAAabMCQ2Du1fb8X/WhDmxHC4UXMzypeOGlH5BZBsgVwSB7vsZLP3MZg=="
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/logger-common/-/logger-common-4.8.6.tgz",
+      "integrity": "sha512-FMRxZGdDxSzd0/Mv0R1021FvUt0CcbsQLYeyckvSWX8w+Uk4o0lcV6UtZdERVR5XZsGOqoXLMIYDbR2vkbGbVw=="
     },
     "@algolia/logger-console": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.8.3.tgz",
-      "integrity": "sha512-Npt+hI4UF8t3TLMluL5utr9Gc11BjL5kDnGZOhDOAz5jYiSO2nrHMFmnpLT4Cy/u7a5t7EB5dlypuC4/AGStkA==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/logger-console/-/logger-console-4.8.6.tgz",
+      "integrity": "sha512-TYw9lwUCjvApC6Z0zn36T6gkCl7hbfJmnU+Z/D8pFJ3Yp7lz06S3oWGjbdrULrYP1w1VOhjd0X7/yGNsMhzutQ==",
       "requires": {
-        "@algolia/logger-common": "4.8.3"
+        "@algolia/logger-common": "4.8.6"
       }
     },
     "@algolia/requester-browser-xhr": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.8.3.tgz",
-      "integrity": "sha512-/LTTIpgEmEwkyhn8yXxDdBWqXqzlgw5w2PtTpIwkSlP2/jDwdR/9w1TkFzhNbJ81ki6LAEQM5mSwoTTnbIIecg==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.8.6.tgz",
+      "integrity": "sha512-omh6uJ3CJXOmcrU9M3/KfGg8XkUuGJGIMkqEbkFvIebpBJxfs6TVs0ziNeMFAcAfhi8/CGgpLbDSgJtWdGQa6w==",
       "requires": {
-        "@algolia/requester-common": "4.8.3"
+        "@algolia/requester-common": "4.8.6"
       }
     },
     "@algolia/requester-common": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.8.3.tgz",
-      "integrity": "sha512-+Yo9vBkofoKR1SCqqtMnmnfq9yt/BiaDewY/6bYSMNxSYCnu2Fw1JKSIaf/4zos09PMSsxGpLohZwGas3+0GDQ=="
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-common/-/requester-common-4.8.6.tgz",
+      "integrity": "sha512-r5xJqq/D9KACkI5DgRbrysVL5DUUagikpciH0k0zjBbm+cXiYfpmdflo/h6JnY6kmvWgjr/4DoeTjKYb/0deAQ=="
     },
     "@algolia/requester-node-http": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.8.3.tgz",
-      "integrity": "sha512-k2fiKIeMIFqgC01FnzII6kqC2GQBAfbNaUX4k7QCPa6P8t4sp2xE6fImOUiztLnnL3C9X9ZX6Fw3L+cudi7jvQ==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-4.8.6.tgz",
+      "integrity": "sha512-TB36OqTVOKyHCOtdxhn/IJyI/NXi/BWy8IEbsiWwwZWlL79NWHbetj49jXWFolEYEuu8PgDjjZGpRhypSuO9XQ==",
       "requires": {
-        "@algolia/requester-common": "4.8.3"
+        "@algolia/requester-common": "4.8.6"
       }
     },
     "@algolia/transporter": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.8.3.tgz",
-      "integrity": "sha512-nU7fy2iU8snxATlsks0MjMyv97QJWQmOVwTjDc+KZ4+nue8CLcgm4LA4dsTBqvxeCQIoEtt3n72GwXcaqiJSjQ==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/@algolia/transporter/-/transporter-4.8.6.tgz",
+      "integrity": "sha512-NRb31J0TP7EPoVMpXZ4yAtr61d26R8KGaf6qdULknvq5sOVHuuH4PwmF08386ERfIsgnM/OBhl+uzwACdCIjSg==",
       "requires": {
-        "@algolia/cache-common": "4.8.3",
-        "@algolia/logger-common": "4.8.3",
-        "@algolia/requester-common": "4.8.3"
+        "@algolia/cache-common": "4.8.6",
+        "@algolia/logger-common": "4.8.6",
+        "@algolia/requester-common": "4.8.6"
       }
     },
     "@ampproject/toolbox-core": {
@@ -1699,26 +1699,37 @@
       }
     },
     "@hashicorp/react-content": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/@hashicorp/react-content/-/react-content-6.2.0.tgz",
-      "integrity": "sha512-t6IgDH8D5zfNZgdCC67iiWBs5QvcguSeHhxWsYgxPdKJPp7El29aS+Y+tw91/tDcdLkuupj7zZVzZ1ED1ubpbA=="
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@hashicorp/react-content/-/react-content-7.0.0.tgz",
+      "integrity": "sha512-7l7OIk26uCMw/4g2asthHnljBlVpDyj/7+Z5QInUXj/U/T/enNWxovkr+DsvIvYJuzSi56juhfXrt3P2q4OnCQ=="
     },
     "@hashicorp/react-docs-page": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/@hashicorp/react-docs-page/-/react-docs-page-10.4.0.tgz",
-      "integrity": "sha512-hlGY1KXcZHOv5x5DNX1/JCFN09km37N3Mwc57g6MjmlalOPVugPeEt5ZZLB5SG3rE5OxqtzJ7PFdh+2Y0Fy3tg==",
+      "version": "12.0.0",
+      "resolved": "https://registry.npmjs.org/@hashicorp/react-docs-page/-/react-docs-page-12.0.0.tgz",
+      "integrity": "sha512-t5HpVsENkUSpbs8Eb5odTVt+Ke2z/LDKiJgC9Jq3+mVtRDXZ0+w5X6XQic8xVRP5McmOKPqoSeqBmgLwIBm1WQ==",
       "requires": {
-        "@hashicorp/react-content": "^6.2.0",
-        "@hashicorp/react-docs-sidenav": "^6.0.1",
-        "@hashicorp/react-head": "^1.1.6",
-        "@hashicorp/react-search": "^3.0.0",
+        "@hashicorp/react-content": "^6.3.0",
+        "@hashicorp/react-docs-sidenav": "^7.0.0",
+        "@hashicorp/react-head": "^1.2.0",
+        "@hashicorp/react-search": "^4.2.0",
         "fs-exists-sync": "0.1.0",
         "gray-matter": "4.0.2",
         "js-yaml": "3.14.0",
         "line-reader": "0.4.0",
+        "moize": "^5.4.7",
         "readdirp": "3.5.0"
       },
       "dependencies": {
+        "@hashicorp/react-content": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/@hashicorp/react-content/-/react-content-6.3.0.tgz",
+          "integrity": "sha512-B+QMlkMGryeNx3dGON4ExbzNvvll2ZXN3x+TkX80tUGClMI80MKjfSXiXIoVixlp22DMNG6wrnL42LC4WzZOxg=="
+        },
+        "@hashicorp/react-head": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/@hashicorp/react-head/-/react-head-1.2.0.tgz",
+          "integrity": "sha512-6BNmhsrzVwJFOAcT3WhSeDlCdtlD3d7vzhXOGfkpPYVnYRaIpLLC6seemAr/wqZhYB87W+KvFilz8vZcpDAZzQ=="
+        },
         "js-yaml": {
           "version": "3.14.0",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
@@ -1731,12 +1742,19 @@
       }
     },
     "@hashicorp/react-docs-sidenav": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@hashicorp/react-docs-sidenav/-/react-docs-sidenav-6.0.1.tgz",
-      "integrity": "sha512-M1G9iehFrNCaBj0v9l9gAi6nRSc43wdkIf6OUeQS82I3QkIKzrBw3hx1PJpElkqoq+CJKk45yZv9jFFjEF3yxg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/@hashicorp/react-docs-sidenav/-/react-docs-sidenav-7.0.0.tgz",
+      "integrity": "sha512-gzOEG4fwfdfdHvxMuRC73bZUIpUzSPrG826NIM4N0lqUPzsAkDsfEl2+Vg1ZVfgzy2+41E+lIpHW4ZmWc5OZ7A==",
       "requires": {
-        "@hashicorp/react-link-wrap": "^0.0.3",
+        "@hashicorp/react-link-wrap": "^2.0.2",
         "fuzzysearch": "1.0.3"
+      },
+      "dependencies": {
+        "@hashicorp/react-link-wrap": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/@hashicorp/react-link-wrap/-/react-link-wrap-2.0.2.tgz",
+          "integrity": "sha512-q8s2TTd9Uy3BSYyUe2TTr2Kbc0ViRc7XQga2fZI0bzlFqBTiMXtf6gh2cg3QvimHY42y4YtaO5C109V9ahMUpQ=="
+        }
       }
     },
     "@hashicorp/react-enterprise-alert": {
@@ -1845,6 +1863,13 @@
         "@hashicorp/react-content": "^6.2.0",
         "@hashicorp/react-head": "^1.1.6",
         "gray-matter": "4.0.2"
+      },
+      "dependencies": {
+        "@hashicorp/react-content": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/@hashicorp/react-content/-/react-content-6.3.0.tgz",
+          "integrity": "sha512-B+QMlkMGryeNx3dGON4ExbzNvvll2ZXN3x+TkX80tUGClMI80MKjfSXiXIoVixlp22DMNG6wrnL42LC4WzZOxg=="
+        }
       }
     },
     "@hashicorp/react-product-downloader": {
@@ -1894,17 +1919,17 @@
       }
     },
     "@hashicorp/react-search": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@hashicorp/react-search/-/react-search-3.0.0.tgz",
-      "integrity": "sha512-62ttyCxjVFSHz1aNbdjeOcqCezpk3dLhMWTXeQb9Zsi0JYaJdBzK1M9khW1bfozTzjTXXGd/B79orlHMj/Zo9A==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@hashicorp/react-search/-/react-search-4.2.0.tgz",
+      "integrity": "sha512-ITj3UC06w+bZKrHv77kYdtWlEH9gbtk+pAzZ5ZRxt2GMnw8qMzWnXZKVf1yHvyKAKkHkGXA5s+uFElxRJj3AVQ==",
       "requires": {
         "@hashicorp/react-inline-svg": "^1.0.2",
         "@hashicorp/remark-plugins": "^3.0.0",
-        "algoliasearch": "^4.4.0",
+        "algoliasearch": "^4.8.4",
         "dotenv": "^8.2.0",
         "glob": "^7.1.6",
         "gray-matter": "^4.0.2",
-        "react-instantsearch-dom": "^6.7.0",
+        "react-instantsearch-dom": "^6.9.0",
         "remark": "^12.0.1",
         "search-insights": "^1.6.0",
         "unist-util-visit": "^2.0.3"
@@ -1914,112 +1939,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/@hashicorp/react-inline-svg/-/react-inline-svg-1.0.2.tgz",
           "integrity": "sha512-AAFnBslSTgnEr++dTbMn3sybAqvn7myIj88ijGigF6u11eSRiV64zqEcyYLQKWTV6dF4AvYoxiYC6GSOgiM0Yw=="
-        },
-        "markdown-table": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-          "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-          "requires": {
-            "repeat-string": "^1.0.0"
-          }
-        },
-        "mdast-util-compact": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
-          "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
-          "requires": {
-            "unist-util-visit": "^2.0.0"
-          }
-        },
-        "parse-entities": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-          "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-          "requires": {
-            "character-entities": "^1.0.0",
-            "character-entities-legacy": "^1.0.0",
-            "character-reference-invalid": "^1.0.0",
-            "is-alphanumerical": "^1.0.0",
-            "is-decimal": "^1.0.0",
-            "is-hexadecimal": "^1.0.0"
-          }
-        },
-        "remark": {
-          "version": "12.0.1",
-          "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz",
-          "integrity": "sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==",
-          "requires": {
-            "remark-parse": "^8.0.0",
-            "remark-stringify": "^8.0.0",
-            "unified": "^9.0.0"
-          }
-        },
-        "remark-parse": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-          "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
-          "requires": {
-            "ccount": "^1.0.0",
-            "collapse-white-space": "^1.0.2",
-            "is-alphabetical": "^1.0.0",
-            "is-decimal": "^1.0.0",
-            "is-whitespace-character": "^1.0.0",
-            "is-word-character": "^1.0.0",
-            "markdown-escapes": "^1.0.0",
-            "parse-entities": "^2.0.0",
-            "repeat-string": "^1.5.4",
-            "state-toggle": "^1.0.0",
-            "trim": "0.0.1",
-            "trim-trailing-lines": "^1.0.0",
-            "unherit": "^1.0.4",
-            "unist-util-remove-position": "^2.0.0",
-            "vfile-location": "^3.0.0",
-            "xtend": "^4.0.1"
-          }
-        },
-        "remark-stringify": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz",
-          "integrity": "sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==",
-          "requires": {
-            "ccount": "^1.0.0",
-            "is-alphanumeric": "^1.0.0",
-            "is-decimal": "^1.0.0",
-            "is-whitespace-character": "^1.0.0",
-            "longest-streak": "^2.0.1",
-            "markdown-escapes": "^1.0.0",
-            "markdown-table": "^2.0.0",
-            "mdast-util-compact": "^2.0.0",
-            "parse-entities": "^2.0.0",
-            "repeat-string": "^1.5.4",
-            "state-toggle": "^1.0.0",
-            "stringify-entities": "^3.0.0",
-            "unherit": "^1.0.4",
-            "xtend": "^4.0.1"
-          }
-        },
-        "stringify-entities": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz",
-          "integrity": "sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==",
-          "requires": {
-            "character-entities-html4": "^1.0.0",
-            "character-entities-legacy": "^1.0.0",
-            "xtend": "^4.0.0"
-          }
-        },
-        "unist-util-remove-position": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-          "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
-          "requires": {
-            "unist-util-visit": "^2.0.0"
-          }
-        },
-        "vfile-location": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
-          "integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="
         }
       }
     },
@@ -2186,17 +2105,17 @@
       }
     },
     "@hashicorp/remark-plugins": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@hashicorp/remark-plugins/-/remark-plugins-3.0.0.tgz",
-      "integrity": "sha512-K5gn2kXW8zs2MSduobwnv5hXPANXfuH3bL5Ji42UoExoUmbitbIONtsn5N8ckeUVL+Ykk8dlMsb7gZkFHalLZg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@hashicorp/remark-plugins/-/remark-plugins-3.1.1.tgz",
+      "integrity": "sha512-qlN/e6UZoaDfBxLduYh7C0CSN7mgCQDqYoBeJmy/KjLHGF54+mUaZAjD3YqNVRm7mPLJYdQzY0sDiL0zG1TbBA==",
       "requires": {
         "github-slugger": "^1.3.0",
-        "remark": "^11.0.2",
+        "remark": "^12.0.1",
         "to-vfile": "^6.1.0",
         "unist-util-flatmap": "^1.0.0",
         "unist-util-is": "^4.0.2",
         "unist-util-map": "^2.0.1",
-        "unist-util-visit": "^2.0.2"
+        "unist-util-visit": "^2.0.3"
       }
     },
     "@mapbox/rehype-prism": {
@@ -2764,30 +2683,30 @@
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
     },
     "algoliasearch": {
-      "version": "4.8.3",
-      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.8.3.tgz",
-      "integrity": "sha512-pljX9jEE2TQ3i1JayhG8afNdE8UuJg3O9c7unW6QO67yRWCKr6b0t5aKC3hSVtjt7pA2TQXLKoAISb4SHx9ozQ==",
+      "version": "4.8.6",
+      "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-4.8.6.tgz",
+      "integrity": "sha512-G8IA3lcgaQB4r9HuQ4G+uSFjjz0Wv2OgEPiQ8emA+G2UUlroOfMl064j1bq/G+QTW0LmTQp9JwrFDRWxFM9J7w==",
       "requires": {
-        "@algolia/cache-browser-local-storage": "4.8.3",
-        "@algolia/cache-common": "4.8.3",
-        "@algolia/cache-in-memory": "4.8.3",
-        "@algolia/client-account": "4.8.3",
-        "@algolia/client-analytics": "4.8.3",
-        "@algolia/client-common": "4.8.3",
-        "@algolia/client-recommendation": "4.8.3",
-        "@algolia/client-search": "4.8.3",
-        "@algolia/logger-common": "4.8.3",
-        "@algolia/logger-console": "4.8.3",
-        "@algolia/requester-browser-xhr": "4.8.3",
-        "@algolia/requester-common": "4.8.3",
-        "@algolia/requester-node-http": "4.8.3",
-        "@algolia/transporter": "4.8.3"
+        "@algolia/cache-browser-local-storage": "4.8.6",
+        "@algolia/cache-common": "4.8.6",
+        "@algolia/cache-in-memory": "4.8.6",
+        "@algolia/client-account": "4.8.6",
+        "@algolia/client-analytics": "4.8.6",
+        "@algolia/client-common": "4.8.6",
+        "@algolia/client-recommendation": "4.8.6",
+        "@algolia/client-search": "4.8.6",
+        "@algolia/logger-common": "4.8.6",
+        "@algolia/logger-console": "4.8.6",
+        "@algolia/requester-browser-xhr": "4.8.6",
+        "@algolia/requester-common": "4.8.6",
+        "@algolia/requester-node-http": "4.8.6",
+        "@algolia/transporter": "4.8.6"
       }
     },
     "algoliasearch-helper": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.3.4.tgz",
-      "integrity": "sha512-1Ts2XcgGdjGlDrp3v6zbY8VW+X9+jJ5rBmtPBmXOQLd4b5t/LpJlaBdxoAnlMfVFjywP7KSAdmyFUNNYVHDyRQ==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/algoliasearch-helper/-/algoliasearch-helper-3.4.4.tgz",
+      "integrity": "sha512-OjyVLjykaYKCMxxRMZNiwLp8CS310E0qAeIY2NaublcmLAh8/SL19+zYHp7XCLtMem2ZXwl3ywMiA32O9jszuw==",
       "requires": {
         "events": "^1.1.1"
       },
@@ -5884,6 +5803,11 @@
       "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
       "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
     },
+    "fast-equals": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-1.6.3.tgz",
+      "integrity": "sha512-4WKW0AL5+WEqO0zWavAfYGY1qwLsBgE//DN4TTcVEN2UlINgkv9b3vm2iHicoenWKSX9mKWmGOsU/iI5IST7pQ=="
+    },
     "fast-glob": {
       "version": "3.2.5",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
@@ -5907,6 +5831,11 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
+    "fast-stringify": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fast-stringify/-/fast-stringify-1.1.2.tgz",
+      "integrity": "sha512-SfslXjiH8km0WnRiuPfpUKwlZjW5I878qsOm+2x8x3TgqmElOOLh1rgJFb+PolNdNRK3r8urEefqx0wt7vx1dA=="
+    },
     "fast-xml-parser": {
       "version": "3.19.0",
       "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz",
@@ -8298,9 +8227,12 @@
       "integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="
     },
     "markdown-table": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-1.1.3.tgz",
-      "integrity": "sha512-1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
+      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
+      "requires": {
+        "repeat-string": "^1.0.0"
+      }
     },
     "marked": {
       "version": "1.2.5",
@@ -8331,21 +8263,11 @@
       }
     },
     "mdast-util-compact": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-1.0.4.tgz",
-      "integrity": "sha512-3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
+      "integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
       "requires": {
-        "unist-util-visit": "^1.1.0"
-      },
-      "dependencies": {
-        "unist-util-visit": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
-          "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
-          "requires": {
-            "unist-util-visit-parents": "^2.0.0"
-          }
-        }
+        "unist-util-visit": "^2.0.0"
       }
     },
     "mdast-util-definitions": {
@@ -8493,6 +8415,11 @@
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
+    "micro-memoize": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/micro-memoize/-/micro-memoize-2.1.2.tgz",
+      "integrity": "sha512-COjNutiFgnDHXZEIM/jYuZPwq2h8zMUeScf6Sh6so98a+REqdlpaNS7Cb2ffGfK5I+xfgoA3Rx49NGuNJTJq3w=="
+    },
     "micromark": {
       "version": "2.11.4",
       "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
@@ -8657,6 +8584,16 @@
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
       "optional": true
     },
+    "moize": {
+      "version": "5.4.7",
+      "resolved": "https://registry.npmjs.org/moize/-/moize-5.4.7.tgz",
+      "integrity": "sha512-7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw==",
+      "requires": {
+        "fast-equals": "^1.6.0",
+        "fast-stringify": "^1.1.0",
+        "micro-memoize": "^2.1.1"
+      }
+    },
     "mozjpeg": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/mozjpeg/-/mozjpeg-7.0.0.tgz",
@@ -9828,9 +9765,9 @@
       }
     },
     "parse-entities": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.2.tgz",
-      "integrity": "sha512-NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
+      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
       "requires": {
         "character-entities": "^1.0.0",
         "character-entities-legacy": "^1.0.0",
@@ -10873,27 +10810,27 @@
       "integrity": "sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA=="
     },
     "react-instantsearch-core": {
-      "version": "6.8.2",
-      "resolved": "https://registry.npmjs.org/react-instantsearch-core/-/react-instantsearch-core-6.8.2.tgz",
-      "integrity": "sha512-UdAjcNIXb2mSECEDS/2XuB4W6rcbnph1NjJBUpY5TLLzSCdKXNTzS2PxF5hkdeuY0L/m/hvDQX6YqxV28PqKLA==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/react-instantsearch-core/-/react-instantsearch-core-6.10.3.tgz",
+      "integrity": "sha512-7twp3OJrPGTFpyXwjJNeOTbQw7RTv+0cUyKkXR9njEyLdXKcPWfpeBirXfdQHjYIHEY2b0V2Vom1B9IHSDSUtQ==",
       "requires": {
         "@babel/runtime": "^7.1.2",
-        "algoliasearch-helper": "^3.1.0",
-        "prop-types": "^15.5.10",
+        "algoliasearch-helper": "^3.4.3",
+        "prop-types": "^15.6.2",
         "react-fast-compare": "^3.0.0"
       }
     },
     "react-instantsearch-dom": {
-      "version": "6.8.2",
-      "resolved": "https://registry.npmjs.org/react-instantsearch-dom/-/react-instantsearch-dom-6.8.2.tgz",
-      "integrity": "sha512-d6YBsjW/aF3qzul7qqUV/KuzEFPVxlAZm3QhREPqMvOyrPTnG5itZZBLe7sFm9OKJ/8shR4TyNp3hb94as7COg==",
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/react-instantsearch-dom/-/react-instantsearch-dom-6.10.3.tgz",
+      "integrity": "sha512-kxc6IEruxJrc7O9lsLV5o4YK/RkGt3l7D1Y51JfmYkgeLuQHApwgcy/TAIoSN7wfR/1DONFbX8Y5VhU9Wqh87Q==",
       "requires": {
         "@babel/runtime": "^7.1.2",
-        "algoliasearch-helper": "^3.1.0",
+        "algoliasearch-helper": "^3.4.3",
         "classnames": "^2.2.5",
-        "prop-types": "^15.5.10",
+        "prop-types": "^15.6.2",
         "react-fast-compare": "^3.0.0",
-        "react-instantsearch-core": "^6.8.2"
+        "react-instantsearch-core": "^6.10.3"
       }
     },
     "react-is": {
@@ -11142,27 +11079,13 @@
       }
     },
     "remark": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-11.0.2.tgz",
-      "integrity": "sha512-bh+eJgn8wgmbHmIBOuwJFdTVRVpl3fcVP6HxmpPWO0ULGP9Qkh6INJh0N5Uy7GqlV7DQYGoqaKiEIpM5LLvJ8w==",
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz",
+      "integrity": "sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==",
       "requires": {
-        "remark-parse": "^7.0.0",
-        "remark-stringify": "^7.0.0",
-        "unified": "^8.2.0"
-      },
-      "dependencies": {
-        "unified": {
-          "version": "8.4.2",
-          "resolved": "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz",
-          "integrity": "sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==",
-          "requires": {
-            "bail": "^1.0.0",
-            "extend": "^3.0.0",
-            "is-plain-obj": "^2.0.0",
-            "trough": "^1.0.0",
-            "vfile": "^4.0.0"
-          }
-        }
+        "remark-parse": "^8.0.0",
+        "remark-stringify": "^8.0.0",
+        "unified": "^9.0.0"
       }
     },
     "remark-footnotes": {
@@ -11300,24 +11223,25 @@
       }
     },
     "remark-parse": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-7.0.2.tgz",
-      "integrity": "sha512-9+my0lQS80IQkYXsMA8Sg6m9QfXYJBnXjWYN5U+kFc5/n69t+XZVXU/ZBYr3cYH8FheEGf1v87rkFDhJ8bVgMA==",
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
+      "integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
       "requires": {
+        "ccount": "^1.0.0",
         "collapse-white-space": "^1.0.2",
         "is-alphabetical": "^1.0.0",
         "is-decimal": "^1.0.0",
         "is-whitespace-character": "^1.0.0",
         "is-word-character": "^1.0.0",
         "markdown-escapes": "^1.0.0",
-        "parse-entities": "^1.1.0",
+        "parse-entities": "^2.0.0",
         "repeat-string": "^1.5.4",
         "state-toggle": "^1.0.0",
         "trim": "0.0.1",
         "trim-trailing-lines": "^1.0.0",
         "unherit": "^1.0.4",
-        "unist-util-remove-position": "^1.0.0",
-        "vfile-location": "^2.0.0",
+        "unist-util-remove-position": "^2.0.0",
+        "vfile-location": "^3.0.0",
         "xtend": "^4.0.1"
       }
     },
@@ -11338,9 +11262,9 @@
       }
     },
     "remark-stringify": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-7.0.4.tgz",
-      "integrity": "sha512-qck+8NeA1D0utk1ttKcWAoHRrJxERYQzkHDyn+pF5Z4whX1ug98uCNPPSeFgLSaNERRxnD6oxIug6DzZQth6Pg==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz",
+      "integrity": "sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==",
       "requires": {
         "ccount": "^1.0.0",
         "is-alphanumeric": "^1.0.0",
@@ -11348,12 +11272,12 @@
         "is-whitespace-character": "^1.0.0",
         "longest-streak": "^2.0.1",
         "markdown-escapes": "^1.0.0",
-        "markdown-table": "^1.1.0",
-        "mdast-util-compact": "^1.0.0",
-        "parse-entities": "^1.0.2",
+        "markdown-table": "^2.0.0",
+        "mdast-util-compact": "^2.0.0",
+        "parse-entities": "^2.0.0",
         "repeat-string": "^1.5.4",
         "state-toggle": "^1.0.0",
-        "stringify-entities": "^2.0.0",
+        "stringify-entities": "^3.0.0",
         "unherit": "^1.0.4",
         "xtend": "^4.0.1"
       }
@@ -11518,9 +11442,9 @@
       }
     },
     "search-insights": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-1.6.3.tgz",
-      "integrity": "sha512-Tvqm+M5A7Udw4MgVMYsy1zRbO1f1wb92ZpexADVu01WLX9yCLHek71EpjPsLDSqkbDwlXI3KFjM+1Y+JFQHpsQ=="
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-1.7.1.tgz",
+      "integrity": "sha512-CSuSKIJp+WcSwYrD9GgIt1e3xmI85uyAefC4/KYGgtvNEm6rt4kBGilhVRmTJXxRE2W1JknvP598Q7SMhm7qKA=="
     },
     "section-matter": {
       "version": "1.0.0",
@@ -12377,15 +12301,13 @@
       }
     },
     "stringify-entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-2.0.0.tgz",
-      "integrity": "sha512-fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz",
+      "integrity": "sha512-3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg==",
       "requires": {
         "character-entities-html4": "^1.0.0",
         "character-entities-legacy": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.2",
-        "is-hexadecimal": "^1.0.0"
+        "xtend": "^4.0.0"
       }
     },
     "stringify-object": {
@@ -13526,21 +13448,11 @@
       }
     },
     "unist-util-remove-position": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz",
-      "integrity": "sha512-tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
+      "integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
       "requires": {
-        "unist-util-visit": "^1.1.0"
-      },
-      "dependencies": {
-        "unist-util-visit": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
-          "integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
-          "requires": {
-            "unist-util-visit-parents": "^2.0.0"
-          }
-        }
+        "unist-util-visit": "^2.0.0"
       }
     },
     "unist-util-stringify-position": {
@@ -13572,21 +13484,6 @@
         }
       }
     },
-    "unist-util-visit-parents": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz",
-      "integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==",
-      "requires": {
-        "unist-util-is": "^3.0.0"
-      },
-      "dependencies": {
-        "unist-util-is": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
-          "integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="
-        }
-      }
-    },
     "universalify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
@@ -13791,9 +13688,9 @@
       }
     },
     "vfile-location": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz",
-      "integrity": "sha512-sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
+      "integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="
     },
     "vfile-message": {
       "version": "2.0.4",
diff --git a/website/package.json b/website/package.json
index 3101948ff2..8dfeda5586 100644
--- a/website/package.json
+++ b/website/package.json
@@ -9,8 +9,9 @@
     "@hashicorp/react-alert-banner": "5.0.0",
     "@hashicorp/react-button": "4.0.0",
     "@hashicorp/react-call-to-action": "1.0.3",
+    "@hashicorp/react-content": "7.0.0",
+    "@hashicorp/react-docs-page": "12.0.0",
     "@hashicorp/react-callouts": "^7.0.0",
-    "@hashicorp/react-docs-page": "10.4.0",
     "@hashicorp/react-featured-slider": "1.1.10",
     "@hashicorp/react-hashi-stack-menu": "1.2.1-canary.0",
     "@hashicorp/react-head": "1.1.6",
diff --git a/website/pages/api-docs/[[...page]].jsx b/website/pages/api-docs/[[...page]].jsx
index efcab6ccd1..1fbc0abf64 100644
--- a/website/pages/api-docs/[[...page]].jsx
+++ b/website/pages/api-docs/[[...page]].jsx
@@ -1,33 +1,36 @@
 import { productName, productSlug } from 'data/metadata'
-import order from 'data/api-navigation.js'
 import DocsPage from '@hashicorp/react-docs-page'
+// Imports below are only used server-side
 import {
   generateStaticPaths,
   generateStaticProps,
 } from '@hashicorp/react-docs-page/server'
 
-const subpath = 'api-docs'
+//  Configure the docs path
+const baseRoute = 'api-docs'
+const navDataFile = `data/${baseRoute}-nav-data.json`
+const localContentDir = `content/${baseRoute}`
+const mainBranch = 'master'
+const product = { name: productName, slug: productSlug }
 
 export default function ApiDocsLayout(props) {
   return (
-    <DocsPage
-      product={{ name: productName, slug: productSlug }}
-      subpath={subpath}
-      order={order}
-      mainBranch="master"
-      staticProps={props}
-    />
+    <DocsPage baseRoute={baseRoute} product={product} staticProps={props} />
   )
 }
 
 export async function getStaticPaths() {
-  return generateStaticPaths(subpath)
+  const paths = await generateStaticPaths({ localContentDir, navDataFile })
+  return { paths, fallback: false }
 }
 
 export async function getStaticProps({ params }) {
-  return generateStaticProps({
-    subpath,
-    productName,
+  const props = await generateStaticProps({
+    localContentDir,
+    mainBranch,
+    navDataFile,
     params,
+    product,
   })
+  return { props }
 }
diff --git a/website/pages/commands/[[...page]].jsx b/website/pages/commands/[[...page]].jsx
index f503a5715c..178c86fa9c 100644
--- a/website/pages/commands/[[...page]].jsx
+++ b/website/pages/commands/[[...page]].jsx
@@ -1,33 +1,36 @@
 import { productName, productSlug } from 'data/metadata'
-import order from 'data/commands-navigation.js'
 import DocsPage from '@hashicorp/react-docs-page'
+// Imports below are only used server-side
 import {
   generateStaticPaths,
   generateStaticProps,
 } from '@hashicorp/react-docs-page/server'
 
-const subpath = 'commands'
+//  Configure the docs path
+const baseRoute = 'commands'
+const navDataFile = `data/${baseRoute}-nav-data.json`
+const localContentDir = `content/${baseRoute}`
+const mainBranch = 'master'
+const product = { name: productName, slug: productSlug }
 
 export default function CommandsLayout(props) {
   return (
-    <DocsPage
-      product={{ name: productName, slug: productSlug }}
-      subpath={subpath}
-      order={order}
-      mainBranch="master"
-      staticProps={props}
-    />
+    <DocsPage baseRoute={baseRoute} product={product} staticProps={props} />
   )
 }
 
 export async function getStaticPaths() {
-  return generateStaticPaths(subpath)
+  const paths = await generateStaticPaths({ localContentDir, navDataFile })
+  return { paths, fallback: false }
 }
 
 export async function getStaticProps({ params }) {
-  return generateStaticProps({
-    subpath,
-    productName,
+  const props = await generateStaticProps({
+    localContentDir,
+    mainBranch,
+    navDataFile,
     params,
+    product,
   })
+  return { props }
 }
diff --git a/website/pages/docs/[[...page]].jsx b/website/pages/docs/[[...page]].jsx
index 68c7fd12f8..99c5aee94e 100644
--- a/website/pages/docs/[[...page]].jsx
+++ b/website/pages/docs/[[...page]].jsx
@@ -1,37 +1,44 @@
 import { productName, productSlug } from 'data/metadata'
-import order from 'data/docs-navigation.js'
 import DocsPage from '@hashicorp/react-docs-page'
+import ConfigEntryReference from 'components/config-entry-reference'
+// Imports below are only used server-side
 import {
   generateStaticPaths,
   generateStaticProps,
 } from '@hashicorp/react-docs-page/server'
-import ConfigEntryReference from 'components/config-entry-reference'
 
-const subpath = 'docs'
+//  Configure the docs path
 const additionalComponents = { ConfigEntryReference }
+const baseRoute = 'docs'
+const navDataFile = `data/${baseRoute}-nav-data.json`
+const localContentDir = `content/${baseRoute}`
+const mainBranch = 'master'
+const product = { name: productName, slug: productSlug }
 
 export default function DocsLayout(props) {
   return (
     <DocsPage
-      product={{ name: productName, slug: productSlug }}
-      subpath={subpath}
-      order={order}
-      staticProps={props}
-      mainBranch="master"
       additionalComponents={additionalComponents}
+      baseRoute={baseRoute}
+      product={product}
+      staticProps={props}
     />
   )
 }
 
 export async function getStaticPaths() {
-  return generateStaticPaths(subpath)
+  const paths = await generateStaticPaths({ localContentDir, navDataFile })
+  return { paths, fallback: false }
 }
 
 export async function getStaticProps({ params }) {
-  return generateStaticProps({
-    subpath,
-    productName,
-    params,
+  const props = await generateStaticProps({
     additionalComponents,
+    localContentDir,
+    mainBranch,
+    navDataFile,
+    params,
+    product,
   })
+  return { props }
 }
diff --git a/website/pages/intro/[[...page]].jsx b/website/pages/intro/[[...page]].jsx
deleted file mode 100644
index 55a61eb445..0000000000
--- a/website/pages/intro/[[...page]].jsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { productName, productSlug } from 'data/metadata'
-import order from 'data/intro-navigation.js'
-import DocsPage from '@hashicorp/react-docs-page'
-import {
-  generateStaticPaths,
-  generateStaticProps,
-} from '@hashicorp/react-docs-page/server'
-
-const subpath = 'intro'
-
-export default function IntroLayout(props) {
-  return (
-    <DocsPage
-      product={{ name: productName, slug: productSlug }}
-      subpath={subpath}
-      order={order}
-      mainBranch="master"
-      staticProps={props}
-    />
-  )
-}
-
-export async function getStaticPaths() {
-  return generateStaticPaths(subpath)
-}
-
-export async function getStaticProps({ params }) {
-  return generateStaticProps({
-    subpath,
-    productName,
-    params,
-  })
-}
diff --git a/website/pages/style.css b/website/pages/style.css
index 16bc2aa2bf..b90e45baeb 100644
--- a/website/pages/style.css
+++ b/website/pages/style.css
@@ -16,7 +16,6 @@
 @import '~@hashicorp/react-consent-manager/style.css';
 @import '~@hashicorp/react-content/style.css';
 @import '~@hashicorp/react-docs-page/style.css';
-@import '~@hashicorp/react-docs-sidenav/style.css';
 @import '~@hashicorp/react-enterprise-alert/style.css';
 @import '~@hashicorp/react-featured-slider/style.css';
 @import '~@hashicorp/react-product-downloader/dist/style.css';