diff --git a/docs/admin/infrastructure/scale-utility.md b/docs/admin/infrastructure/scale-utility.md
index 6945b54bf559e..0761b23a0ff95 100644
--- a/docs/admin/infrastructure/scale-utility.md
+++ b/docs/admin/infrastructure/scale-utility.md
@@ -130,7 +130,7 @@ wish to clean up all workspaces, you can run the following command:
 ```shell
 coder exp scaletest cleanup \
     --cleanup-job-timeout 2h \
-    --cleanup-timeout 15min
+    --cleanup-timeout 15m
 ```
 
 This will delete all workspaces and users with the prefix `scaletest-`.
diff --git a/docs/admin/integrations/dx-data-cloud.md b/docs/admin/integrations/dx-data-cloud.md
index 3556370535f63..51ae222f96183 100644
--- a/docs/admin/integrations/dx-data-cloud.md
+++ b/docs/admin/integrations/dx-data-cloud.md
@@ -30,10 +30,11 @@ If your organization already uses the Coder-DX integration, you can find a list
 
 ### CLI
 
-Use `users list` to export the list of users to a CSV file:
+Use `users list` with `jq` to export the list of users to a CSV file:
 
 ```shell
-coder users list > users.csv
+coder users list --output json | \
+  jq -r '["username","email","created_at","status"], (.[] | [.username, .email, .created_at, .status]) | @csv' > users.csv
 ```
 
 Visit the [users list](../../reference/cli/users_list.md) documentation for more options.
diff --git a/docs/admin/users/index.md b/docs/admin/users/index.md
index b49ac35905439..92639fa6ae09b 100644
--- a/docs/admin/users/index.md
+++ b/docs/admin/users/index.md
@@ -230,10 +230,11 @@ You can use the Coder CLI or API to retrieve your list of users.
 
 ### CLI
 
-Use `users list` to export the list of users to a CSV file:
+Use `users list` with `jq` to export the list of users to a CSV file:
 
 ```shell
-coder users list > users.csv
+coder users list --output json | \
+  jq -r '["username","email","created_at","status"], (.[] | [.username, .email, .created_at, .status]) | @csv' > users.csv
 ```
 
 Visit the [users list](../../reference/cli/users_list.md) documentation for more options.
diff --git a/docs/ai-coder/github-to-tasks.md b/docs/ai-coder/github-to-tasks.md
index 408dd8c101c23..16c002fffcdc7 100644
--- a/docs/ai-coder/github-to-tasks.md
+++ b/docs/ai-coder/github-to-tasks.md
@@ -99,9 +99,6 @@ You must also set `coder-template-name` as part of this. The GHA example has thi
 ```bash
 # List all templates in your organization
 coder templates list
-
-# List templates in a specific organization
-coder templates list --org your-org-name
 ```
 
 You can also choose to modify the other [input parameters](https://github.com/coder/create-task-action?tab=readme-ov-file#inputs) to better fit your desired workflow.
@@ -229,7 +226,7 @@ Generate a new token with these permissions at `https://<your-coder-url>/deploym
 
 **Solution:**
 
-1. Verify the template name using: `coder templates list --org your-org-name`
+1. Verify the template name using: `coder templates list`
 1. Update the `coder-template-name` input in your workflow file to match exactly, or input secret or variable saved in GitHub
 1. Ensure the template exists in the organization specified by `coder-organization`
 
diff --git a/docs/user-guides/workspace-access/index.md b/docs/user-guides/workspace-access/index.md
index da72459cbbd66..6ab5004374d9b 100644
--- a/docs/user-guides/workspace-access/index.md
+++ b/docs/user-guides/workspace-access/index.md
@@ -176,7 +176,7 @@ services or preview environments.
 
 You can also [share ports](./port-forwarding.md#sharing-ports) with other users,
 or [port-forward](./port-forwarding.md#the-coder-port-forward-command) through
-the CLI with `coder port forward`. Read more in the
+the CLI with `coder port-forward`. Read more in the
 [docs on workspace ports](./port-forwarding.md).
 
 ![Open Ports window](../../images/networking/listeningports.png)