diff --git a/docs/src/content/docs/guides/github-actions-primer.md b/docs/src/content/docs/guides/github-actions-primer.md
index 164b9ec25db..d1e035ff1f8 100644
--- a/docs/src/content/docs/guides/github-actions-primer.md
+++ b/docs/src/content/docs/guides/github-actions-primer.md
@@ -34,7 +34,7 @@ jobs:
 
 ### Jobs
 
-A **job** is a set of steps that execute on the same runner (virtual machine). Jobs run in parallel by default but can depend on each other with `needs:`. Each job runs in a fresh VM, and results are shared between jobs using artifacts. Default timeout is 360 minutes.
+A **job** is a set of steps that execute on the same runner (virtual machine). Jobs run in parallel by default but can depend on each other with `needs:`. Each job runs in a fresh VM, and results are shared between jobs using artifacts. Default timeout is 360 minutes for standard GitHub Actions jobs; the agent execution step in agentic workflows defaults to 20 minutes.
 
 ```yaml
 jobs:
diff --git a/docs/src/content/docs/reference/custom-safe-outputs.md b/docs/src/content/docs/reference/custom-safe-outputs.md
index dfcb0d1ee7a..402e8881a73 100644
--- a/docs/src/content/docs/reference/custom-safe-outputs.md
+++ b/docs/src/content/docs/reference/custom-safe-outputs.md
@@ -229,7 +229,7 @@ The agent uses read-only tools to query, then calls the safe-job which executes
 | `permissions` | object | No | GitHub token permissions for the job |
 | `env` | object | No | Environment variables for all steps |
 | `if` | string | No | Conditional execution expression |
-| `timeout-minutes` | number | No | Maximum job duration (default: 360) |
+| `timeout-minutes` | number | No | Maximum job duration (GitHub Actions default: 360) |
 
 ### Input Types
 
diff --git a/docs/src/content/docs/reference/frontmatter.md b/docs/src/content/docs/reference/frontmatter.md
index ec524b299d0..a088c711034 100644
--- a/docs/src/content/docs/reference/frontmatter.md
+++ b/docs/src/content/docs/reference/frontmatter.md
@@ -697,7 +697,7 @@ The following job-level fields are supported in custom jobs:
 | `permissions` | GitHub token permissions for this job |
 | `outputs` | Values exposed to downstream jobs |
 | `env` | Environment variables available to all steps |
-| `timeout-minutes` | Maximum job duration (default: 360) |
+| `timeout-minutes` | Maximum job duration (GitHub Actions default: 360) |
 | `concurrency` | Concurrency group to prevent parallel runs |
 | `continue-on-error` | Allow the workflow to continue if this job fails |
 | `container` | Docker container to run steps in |
diff --git a/docs/src/content/docs/reference/glossary.md b/docs/src/content/docs/reference/glossary.md
index 89776be8e22..b1ad6bb6a52 100644
--- a/docs/src/content/docs/reference/glossary.md
+++ b/docs/src/content/docs/reference/glossary.md
@@ -443,7 +443,7 @@ Automatic distribution of workflow execution times across the day to reduce load
 
 ### Timeout
 
-Maximum duration a workflow can run before automatic cancellation. Configured via `timeout-minutes:` in frontmatter. Default is 360 minutes (6 hours); workflows can specify shorter timeouts to fail faster.
+Maximum duration a workflow can run before automatic cancellation. Configured via `timeout-minutes:` in frontmatter. The agent execution step defaults to 20 minutes; other jobs (custom jobs, safe-output jobs) use the GitHub Actions platform default of 360 minutes unless explicitly set. Workflows can specify longer timeouts if needed.
 
 ### Toolsets
 
diff --git a/docs/src/content/docs/reference/rate-limiting-controls.md b/docs/src/content/docs/reference/rate-limiting-controls.md
index c45a8e8b1f0..a89e3a68dff 100644
--- a/docs/src/content/docs/reference/rate-limiting-controls.md
+++ b/docs/src/content/docs/reference/rate-limiting-controls.md
@@ -37,10 +37,10 @@ This prevents parallel execution explosions and AI resource exhaustion. See [Con
 
 ## Timeouts
 
-Jobs have maximum execution times (default: 360 minutes) controlled by the top-level `timeout-minutes` field:
+The agent execution step has a default timeout of 20 minutes, controlled by the top-level `timeout-minutes` field. Other jobs (custom jobs, safe-output jobs) use the GitHub Actions platform default of 360 minutes unless explicitly set:
 
 ```yaml wrap
-timeout-minutes: 120  # Apply 120-minute timeout to all jobs
+timeout-minutes: 120  # Apply 120-minute timeout to the agent execution step
 ```
 
 The `stop-after` field provides additional control for when workflows should stop running: