diff --git a/.changeset/patch-update-apm-v0-8-4.md b/.changeset/patch-update-apm-v0-8-4.md
new file mode 100644
index 00000000000..6d121c0879d
--- /dev/null
+++ b/.changeset/patch-update-apm-v0-8-4.md
@@ -0,0 +1,5 @@
+---
+"gh-aw": patch
+---
+
+Update APM to v0.8.4 to pick up the auth and logging architecture overhaul and support documented `${input:...}` variables for MCP server headers and environment configuration.
diff --git a/.github/workflows/smoke-claude.lock.yml b/.github/workflows/smoke-claude.lock.yml
index ff7ca62aae6..4c882d5e6b6 100644
--- a/.github/workflows/smoke-claude.lock.yml
+++ b/.github/workflows/smoke-claude.lock.yml
@@ -68,7 +68,7 @@ jobs:
       issues: write
       pull-requests: write
     env:
-      GH_AW_INFO_APM_VERSION: v0.8.3
+      GH_AW_INFO_APM_VERSION: v0.8.4
     outputs:
       body: ${{ steps.sanitized.outputs.body }}
       comment_id: ${{ steps.add-comment.outputs.comment-id }}
@@ -107,7 +107,7 @@ jobs:
           GH_AW_INFO_FIREWALL_ENABLED: "true"
           GH_AW_INFO_AWF_VERSION: "v0.24.5"
           GH_AW_INFO_AWMG_VERSION: ""
-          GH_AW_INFO_APM_VERSION: "v0.8.3"
+          GH_AW_INFO_APM_VERSION: "v0.8.4"
           GH_AW_INFO_FIREWALL_TYPE: "squid"
           GH_AW_COMPILED_STRICT: "false"
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
@@ -693,7 +693,7 @@ jobs:
       GH_AW_ASSETS_ALLOWED_EXTS: ""
       GH_AW_ASSETS_BRANCH: ""
       GH_AW_ASSETS_MAX_SIZE_KB: 0
-      GH_AW_INFO_APM_VERSION: v0.8.3
+      GH_AW_INFO_APM_VERSION: v0.8.4
       GH_AW_MCP_LOG_DIR: /tmp/gh-aw/mcp-logs/safeoutputs
       GH_AW_WORKFLOW_ID_SANITIZED: smokeclaude
     outputs:
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
index 4b5ba4d5bbe..cfa728e927a 100644
--- a/pkg/constants/constants.go
+++ b/pkg/constants/constants.go
@@ -419,7 +419,7 @@ var SerenaLanguageSupport = map[string][]string{
 }
 
 // DefaultAPMVersion is the default version of the microsoft/APM (Agent Package Manager) CLI
-const DefaultAPMVersion Version = "v0.8.3"
+const DefaultAPMVersion Version = "v0.8.4"
 
 // DefaultPlaywrightMCPVersion is the default version of the @playwright/mcp package
 const DefaultPlaywrightMCPVersion Version = "0.0.68"
diff --git a/pkg/workflow/data/action_pins.json b/pkg/workflow/data/action_pins.json
index b9e919b7cd5..81223426c5b 100644
--- a/pkg/workflow/data/action_pins.json
+++ b/pkg/workflow/data/action_pins.json
@@ -148,6 +148,11 @@
       "version": "v4.34.1",
       "sha": "cb06a0a8527b2c6970741b3a0baa15231dc74a4c"
     },
+    "github/gh-aw-actions/setup@v0": {
+      "repo": "github/gh-aw-actions/setup",
+      "version": "v0",
+      "sha": "50f4fc16883c6c6672d8879affa8fd15d5cc79a4"
+    },
     "github/gh-aw-actions/setup@v0.62.5": {
       "repo": "github/gh-aw-actions/setup",
       "version": "v0.62.5",