diff --git a/website/docs/commands/providers.html.markdown b/website/docs/commands/providers.html.markdown
index d30c213030..4da6a4e3b6 100644
--- a/website/docs/commands/providers.html.markdown
+++ b/website/docs/commands/providers.html.markdown
@@ -1,5 +1,5 @@
---
-layout: "commands-providers"
+layout: "docs"
page_title: "Command: providers"
sidebar_current: "docs-commands-providers"
description: |-
diff --git a/website/docs/commands/providers/lock.html.md b/website/docs/commands/providers/lock.html.md
index 25dea21e1c..affa202a92 100644
--- a/website/docs/commands/providers/lock.html.md
+++ b/website/docs/commands/providers/lock.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-providers"
+layout: "docs"
page_title: "Command: providers lock"
sidebar_current: "docs-commands-providers-lock"
description: |-
diff --git a/website/docs/commands/providers/mirror.html.md b/website/docs/commands/providers/mirror.html.md
index 39e7b183bb..829508d2f4 100644
--- a/website/docs/commands/providers/mirror.html.md
+++ b/website/docs/commands/providers/mirror.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-providers"
+layout: "docs"
page_title: "Command: providers mirror"
sidebar_current: "docs-commands-providers-mirror"
description: |-
diff --git a/website/docs/commands/providers/schema.html.md b/website/docs/commands/providers/schema.html.md
index 717d463eb0..e97e50f230 100644
--- a/website/docs/commands/providers/schema.html.md
+++ b/website/docs/commands/providers/schema.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-providers"
+layout: "docs"
page_title: "Command: providers schema"
sidebar_current: "docs-commands-providers-schema"
description: |-
diff --git a/website/docs/commands/state/addressing.html.md b/website/docs/commands/state/addressing.html.md
index 0df9511881..323b588395 100644
--- a/website/docs/commands/state/addressing.html.md
+++ b/website/docs/commands/state/addressing.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-state"
+layout: "docs"
page_title: "Command: state resource addressing"
sidebar_current: "docs-commands-state-address"
description: |-
diff --git a/website/docs/commands/state/index.html.md b/website/docs/commands/state/index.html.md
index 4c2154caad..e3faf2460f 100644
--- a/website/docs/commands/state/index.html.md
+++ b/website/docs/commands/state/index.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-state"
+layout: "docs"
page_title: "Command: state"
sidebar_current: "docs-commands-state-index"
description: |-
diff --git a/website/docs/commands/state/list.html.md b/website/docs/commands/state/list.html.md
index dea39e2c19..7763f9b089 100644
--- a/website/docs/commands/state/list.html.md
+++ b/website/docs/commands/state/list.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-state"
+layout: "docs"
page_title: "Command: state list"
sidebar_current: "docs-commands-state-sub-list"
description: |-
diff --git a/website/docs/commands/state/mv.html.md b/website/docs/commands/state/mv.html.md
index bb35b13999..41118ed0f1 100644
--- a/website/docs/commands/state/mv.html.md
+++ b/website/docs/commands/state/mv.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-state"
+layout: "docs"
page_title: "Command: state mv"
sidebar_current: "docs-commands-state-sub-mv"
description: |-
diff --git a/website/docs/commands/state/pull.html.md b/website/docs/commands/state/pull.html.md
index 394881b45c..f6aa69b97d 100644
--- a/website/docs/commands/state/pull.html.md
+++ b/website/docs/commands/state/pull.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-state"
+layout: "docs"
page_title: "Command: state pull"
sidebar_current: "docs-commands-state-sub-pull"
description: |-
diff --git a/website/docs/commands/state/push.html.md b/website/docs/commands/state/push.html.md
index 13303ad2ed..4ba3f47c2e 100644
--- a/website/docs/commands/state/push.html.md
+++ b/website/docs/commands/state/push.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-state"
+layout: "docs"
page_title: "Command: state push"
sidebar_current: "docs-commands-state-sub-push"
description: |-
diff --git a/website/docs/commands/state/replace-provider.html.md b/website/docs/commands/state/replace-provider.html.md
index 1219c12a26..c1b4d511fb 100644
--- a/website/docs/commands/state/replace-provider.html.md
+++ b/website/docs/commands/state/replace-provider.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-state"
+layout: "docs"
page_title: "Command: state replace-provider"
sidebar_current: "docs-commands-state-sub-replace-provider"
description: |-
diff --git a/website/docs/commands/state/rm.html.md b/website/docs/commands/state/rm.html.md
index cbdfc766e3..f153320e6c 100644
--- a/website/docs/commands/state/rm.html.md
+++ b/website/docs/commands/state/rm.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-state"
+layout: "docs"
page_title: "Command: state rm"
sidebar_current: "docs-commands-state-sub-rm"
description: |-
diff --git a/website/docs/commands/state/show.html.md b/website/docs/commands/state/show.html.md
index 6cf8984a87..da95b38226 100644
--- a/website/docs/commands/state/show.html.md
+++ b/website/docs/commands/state/show.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-state"
+layout: "docs"
page_title: "Command: state show"
sidebar_current: "docs-commands-state-sub-show"
description: |-
diff --git a/website/docs/commands/workspace/delete.html.md b/website/docs/commands/workspace/delete.html.md
index f489009c13..e980386504 100644
--- a/website/docs/commands/workspace/delete.html.md
+++ b/website/docs/commands/workspace/delete.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-workspace"
+layout: "docs"
page_title: "Command: workspace delete"
sidebar_current: "docs-commands-workspace-sub-delete"
description: |-
diff --git a/website/docs/commands/workspace/index.html.md b/website/docs/commands/workspace/index.html.md
index 6ec535d632..354d96e253 100644
--- a/website/docs/commands/workspace/index.html.md
+++ b/website/docs/commands/workspace/index.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-workspace"
+layout: "docs"
page_title: "Command: workspace"
sidebar_current: "docs-commands-workspace-index"
description: |-
diff --git a/website/docs/commands/workspace/list.html.md b/website/docs/commands/workspace/list.html.md
index a44cab8af8..0b0f842a10 100644
--- a/website/docs/commands/workspace/list.html.md
+++ b/website/docs/commands/workspace/list.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-workspace"
+layout: "docs"
page_title: "Command: workspace list"
sidebar_current: "docs-commands-workspace-sub-list"
description: |-
diff --git a/website/docs/commands/workspace/new.html.md b/website/docs/commands/workspace/new.html.md
index d414734403..7b76b0cbce 100644
--- a/website/docs/commands/workspace/new.html.md
+++ b/website/docs/commands/workspace/new.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-workspace"
+layout: "docs"
page_title: "Command: workspace new"
sidebar_current: "docs-commands-workspace-sub-new"
description: |-
diff --git a/website/docs/commands/workspace/select.html.md b/website/docs/commands/workspace/select.html.md
index 197eb64d73..eaadd59b64 100644
--- a/website/docs/commands/workspace/select.html.md
+++ b/website/docs/commands/workspace/select.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-workspace"
+layout: "docs"
page_title: "Command: workspace select"
sidebar_current: "docs-commands-workspace-sub-select"
description: |-
diff --git a/website/docs/commands/workspace/show.html.md b/website/docs/commands/workspace/show.html.md
index 228bc13c0e..7cd7d5b5d1 100644
--- a/website/docs/commands/workspace/show.html.md
+++ b/website/docs/commands/workspace/show.html.md
@@ -1,5 +1,5 @@
---
-layout: "commands-workspace"
+layout: "docs"
page_title: "Command: workspace show"
sidebar_current: "docs-commands-workspace-sub-show"
description: |-