diff --git a/.agents/skills/release_updates/SKILL.md b/.agents/skills/release_updates/SKILL.md
index c14b7d63..4f3dc3cb 100644
--- a/.agents/skills/release_updates/SKILL.md
+++ b/.agents/skills/release_updates/SKILL.md
@@ -39,7 +39,7 @@ They support the following:
 
 - Resolver script path (default):
   `.agents/skills/release_updates/scripts/resolve_oncall_reviewers.py`
-- `GRAFANA_API_KEY` environment variable.
+- `DOCS_AGENT_GRAFANA_TOKEN` environment variable.
 
 ### Recommended
 
@@ -185,7 +185,7 @@ python3 .agents/skills/release_updates/scripts/run_release_updates.py \
 
 Notes:
 
-- Requires `GRAFANA_API_KEY` in the environment.
+- Requires `DOCS_AGENT_GRAFANA_TOKEN` in the environment.
 - Uses resolver script (by default):
   `.agents/skills/release_updates/scripts/resolve_oncall_reviewers.py`
 - Repeat `--oncall-schedule-id` to resolve one reviewer per schedule, in order.
diff --git a/.agents/skills/release_updates/scripts/resolve_oncall_reviewers.py b/.agents/skills/release_updates/scripts/resolve_oncall_reviewers.py
index 3d43258f..ad891ee5 100644
--- a/.agents/skills/release_updates/scripts/resolve_oncall_reviewers.py
+++ b/.agents/skills/release_updates/scripts/resolve_oncall_reviewers.py
@@ -321,9 +321,9 @@ def parse_args() -> argparse.Namespace:
 
 def main() -> int:
     args = parse_args()
-    api_key = os.environ.get("GRAFANA_API_KEY")
+    api_key = os.environ.get("DOCS_AGENT_GRAFANA_TOKEN")
     if not api_key:
-        print("GRAFANA_API_KEY env var required", file=sys.stderr)
+        print("DOCS_AGENT_GRAFANA_TOKEN env var required", file=sys.stderr)
         return 1
 
     users = get_oncall_users(
diff --git a/.agents/skills/release_updates/scripts/setup_environment.py b/.agents/skills/release_updates/scripts/setup_environment.py
index 9832f19b..77c4f501 100644
--- a/.agents/skills/release_updates/scripts/setup_environment.py
+++ b/.agents/skills/release_updates/scripts/setup_environment.py
@@ -179,7 +179,7 @@ def main() -> int:
     checks: dict[str, Any] = {
         "commands": {},
         "gh_authenticated": None,
-        "grafana_api_key_present": None,
+        "docs_agent_grafana_token_present": None,
         "oncall_resolver_exists": None,
         "local_channel_versions_present": None,
     }
@@ -252,10 +252,10 @@ def main() -> int:
             f"{resolver_path}. Pass --oncall-resolver-script.",
         )
 
-    grafana_api_key_present = bool(os.environ.get("GRAFANA_API_KEY"))
-    checks["grafana_api_key_present"] = grafana_api_key_present
-    if args.require_oncall_reviewer and not grafana_api_key_present:
-        errors.append("Missing required env var for reviewer assignment: GRAFANA_API_KEY")
+    docs_agent_grafana_token_present = bool(os.environ.get("DOCS_AGENT_GRAFANA_TOKEN"))
+    checks["docs_agent_grafana_token_present"] = docs_agent_grafana_token_present
+    if args.require_oncall_reviewer and not docs_agent_grafana_token_present:
+        errors.append("Missing required env var for reviewer assignment: DOCS_AGENT_GRAFANA_TOKEN")
 
     report: dict[str, Any] = {
         "generated_at_utc": utc_now_iso(),
diff --git a/.github/workflows/release-docs-update.yml b/.github/workflows/release-docs-update.yml
index c17414cd..edf2fc0b 100644
--- a/.github/workflows/release-docs-update.yml
+++ b/.github/workflows/release-docs-update.yml
@@ -121,7 +121,7 @@ jobs:
       # 2. the channel-versions dispatch sender is tested.
       # 3. required secrets, variables, and cross-repo permissions are configured.
       # WARP_AGENT_PROFILE should be set to the Docs Agent on prod Oz (oz.warp.dev).
-      # That agent has GRAFANA_API_KEY configured for on-call reviewer assignment.
+      # That agent has DOCS_AGENT_GRAFANA_TOKEN configured for on-call reviewer assignment.
       - name: Run release docs update with Oz
         uses: warpdotdev/oz-agent-action@v1
         with:
@@ -143,7 +143,7 @@ jobs:
             4. Create and switch to a release docs feature branch before invoking `run_release_updates.py --create-pr`; the script refuses to create a PR from `main`.
             5. Create or update a PR against `warpdotdev/docs` `main` only if generated changes exist.
             6. Use a draft PR when create_draft_pr is true. Note: --pr-draft and --pr-auto-merge are mutually exclusive; never pass both.
-            7. Assign on-call reviewers only when the active trigger's assign_oncall_reviewers value is true and the required Grafana schedule IDs and `GRAFANA_API_KEY` are available.
+            7. Assign on-call reviewers only when the active trigger's assign_oncall_reviewers value is true, the required Grafana schedule IDs are configured, and `DOCS_AGENT_GRAFANA_TOKEN` is available in the environment.
             8. Run `npm run build` before considering the PR ready for review.
             9. If no docs changes are needed, report a no-op result and do not open a PR.