diff --git a/website/content/api-docs/operator/keyring.mdx b/website/content/api-docs/operator/keyring.mdx
index aed4787fd..f19afb47f 100644
--- a/website/content/api-docs/operator/keyring.mdx
+++ b/website/content/api-docs/operator/keyring.mdx
@@ -151,7 +151,7 @@ $ curl \
 ```
 
 
-[Key Management]: /docs/concepts/key-management
-[`nomad operator root keyring`]: /docs/commands/operator/root/keyring
+[Key Management]: /docs/operations/key-management
+[`nomad operator root keyring`]: /docs/commands/operator/root/keyring-rotate
 [blocking queries]: /api-docs#blocking-queries
 [required ACLs]: /api-docs#acls
diff --git a/website/content/docs/commands/eval/delete.mdx b/website/content/docs/commands/eval/delete.mdx
index ae217f5d9..4939c12f8 100644
--- a/website/content/docs/commands/eval/delete.mdx
+++ b/website/content/docs/commands/eval/delete.mdx
@@ -50,6 +50,7 @@ Successfuly deleted 1 evaluation
 ```
 
 Delete all evaluations with status `pending` for the `example` job:
+
 ```shell-session
 $ nomad eval delete -filter='Stauts == "pending" and JobID == "example"'
 Do you want to list evals (3) before deletion? [y/N] y
@@ -66,10 +67,11 @@ Successfuly deleted 3 evaluations
 
 Delete all evaluations for the `system` and `service` whilst skipping all
 prompts:
+
 ```shell-session
 $ nomad eval delete -filter='Scheduler == "system" or Scheduler == "service"' -yes
 Successfuly deleted 23 evaluations
 ```
 
-[scheduler_get_config]: /docs/commands/operator/scheduler-get-config
-[scheduler_set_config]: /docs/commands/operator/scheduler-set-config
+[scheduler_get_config]: /docs/commands/operator/scheduler/get-config
+[scheduler_set_config]: /docs/commands/operator/scheduler/set-config
diff --git a/website/content/docs/commands/operator/index.mdx b/website/content/docs/commands/operator/index.mdx
index 21043b306..f9e6a28a0 100644
--- a/website/content/docs/commands/operator/index.mdx
+++ b/website/content/docs/commands/operator/index.mdx
@@ -57,17 +57,17 @@ The following subcommands are available:
 - [`operator snapshot inspect`][snapshot-inspect] - Inspects a snapshot of the Nomad server state
 
 [debug]: /docs/commands/operator/debug 'Builds an archive of configuration and state'
-[get-config]: /docs/commands/operator/autopilot-get-config 'Autopilot Get Config command'
+[get-config]: /docs/commands/operator/autopilot/get-config 'Autopilot Get Config command'
 [keygen]: /docs/commands/operator/keygen 'Generates a new encryption key'
 [keyring]: /docs/commands/operator/keyring 'Manages gossip layer encryption keys'
-[list]: /docs/commands/operator/raft-list-peers 'Raft List Peers command'
+[list]: /docs/commands/operator/raft/list-peers 'Raft List Peers command'
 [operator]: /api-docs/operator 'Operator API documentation'
 [outage recovery guide]: https://learn.hashicorp.com/tutorials/nomad/outage-recovery
-[remove]: /docs/commands/operator/raft-remove-peer 'Raft Remove Peer command'
-[set-config]: /docs/commands/operator/autopilot-set-config 'Autopilot Set Config command'
-[snapshot-save]: /docs/commands/operator/snapshot-save 'Snapshot Save command'
-[snapshot-restore]: /docs/commands/operator/snapshot-restore 'Snapshot Restore command'
-[snapshot-inspect]: /docs/commands/operator/snapshot-inspect 'Snapshot Inspect command'
-[snapshot-agent]: /docs/commands/operator/snapshot-agent 'Snapshot Agent command'
-[scheduler-get-config]: /docs/commands/operator/scheduler-get-config 'Scheduler Get Config command'
-[scheduler-set-config]: /docs/commands/operator/scheduler-set-config 'Scheduler Set Config command'
+[remove]: /docs/commands/operator/raft/remove-peer 'Raft Remove Peer command'
+[set-config]: /docs/commands/operator/autopilot/set-config 'Autopilot Set Config command'
+[snapshot-save]: /docs/commands/operator/snapshot/save 'Snapshot Save command'
+[snapshot-restore]: /docs/commands/operator/snapshot/restore 'Snapshot Restore command'
+[snapshot-inspect]: /docs/commands/operator/snapshot/inspect 'Snapshot Inspect command'
+[snapshot-agent]: /docs/commands/operator/snapshot/agent 'Snapshot Agent command'
+[scheduler-get-config]: /docs/commands/operator/scheduler/get-config 'Scheduler Get Config command'
+[scheduler-set-config]: /docs/commands/operator/scheduler/set-config 'Scheduler Set Config command'
diff --git a/website/content/docs/configuration/server.mdx b/website/content/docs/configuration/server.mdx
index 99a1bb48e..d12ae04fd 100644
--- a/website/content/docs/configuration/server.mdx
+++ b/website/content/docs/configuration/server.mdx
@@ -186,7 +186,7 @@ server {
   when raising this value is that during network partitions or other events
   (server crash) where a leader is lost, Nomad will not elect a new leader for
   a longer period of time than the default. The [`nomad.nomad.leader.barrier` and
-  `nomad.raft.leader.lastContact` metrics](/docs/operations/metrics) are a good
+  `nomad.raft.leader.lastContact` metrics](/docs/operations/metrics-reference) are a good
   indicator of how often leader elections occur and raft latency.
 
 - `redundancy_zone` `(string: "")` - (Enterprise-only) Specifies the redundancy
diff --git a/website/content/docs/enterprise/index.mdx b/website/content/docs/enterprise/index.mdx
index 78ebf806a..da90e9b03 100644
--- a/website/content/docs/enterprise/index.mdx
+++ b/website/content/docs/enterprise/index.mdx
@@ -54,7 +54,7 @@ This capability provides an enterprise solution for backup and restoring the
 state of Nomad servers within an environment in an automated manner. These
 snapshots are atomic and point-in-time.
 
-See the [Operator Snapshot agent](/docs/commands/operator/snapshot-agent)
+See the [Operator Snapshot agent](/docs/commands/operator/snapshot/agent)
 documentation for a thorough overview.
 
 ### Enhanced Read Scalability
diff --git a/website/content/docs/operations/key-management.mdx b/website/content/docs/operations/key-management.mdx
index 3f243c5bb..89ed47f06 100644
--- a/website/content/docs/operations/key-management.mdx
+++ b/website/content/docs/operations/key-management.mdx
@@ -55,7 +55,7 @@ key files are needed to recover the cluster. Operators should include these
 files as part of your organization's backup and recovery strategy for the
 cluster.
 
-[Variables]: /docs/concepts/variables
+[variables]: /docs/concepts/variables
 [workload identities]: /docs/concepts/workload-identity
 [data directory]: /docs/configuration#data_dir
-[`nomad operator root keyring rotate -full`]: /docs/commands/operator/root/keyring-rotate.mdx
+[`nomad operator root keyring rotate -full`]: /docs/commands/operator/root/keyring-rotate