diff --git a/.github/workflows/dev.lock.yml b/.github/workflows/dev.lock.yml
index f3529765d6..2dafd567e8 100644
--- a/.github/workflows/dev.lock.yml
+++ b/.github/workflows/dev.lock.yml
@@ -564,7 +564,7 @@ jobs:
         run: |
           set -o pipefail
                     # Execute OpenCode CLI with prompt from file
-                    NODE_BIN_PATH="$(find /opt/hostedtoolcache/node -mindepth 1 -maxdepth 1 -type d | head -1 | xargs basename)/x64/bin" && export PATH="/opt/hostedtoolcache/node/$NODE_BIN_PATH:$PATH" && 'opencode run' "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)" --print-logs${GH_AW_MODEL_AGENT_OPENCODE:+ --model "$GH_AW_MODEL_AGENT_OPENCODE"} 2>&1 | tee /tmp/gh-aw/agent-stdio.log
+                    opencode run "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)" --print-logs${GH_AW_MODEL_AGENT_OPENCODE:+ --model "$GH_AW_MODEL_AGENT_OPENCODE"} 2>&1 | tee /tmp/gh-aw/agent-stdio.log
         env:
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           GH_AW_MCP_CONFIG: /tmp/gh-aw/mcp-config/mcp-servers.json
@@ -870,7 +870,7 @@ jobs:
         run: |
           set -o pipefail
                     # Execute OpenCode CLI with prompt from file
-                    NODE_BIN_PATH="$(find /opt/hostedtoolcache/node -mindepth 1 -maxdepth 1 -type d | head -1 | xargs basename)/x64/bin" && export PATH="/opt/hostedtoolcache/node/$NODE_BIN_PATH:$PATH" && 'opencode run' "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)" --print-logs${GH_AW_MODEL_DETECTION_OPENCODE:+ --model "$GH_AW_MODEL_DETECTION_OPENCODE"} 2>&1 | tee /tmp/gh-aw/threat-detection/detection.log
+                    opencode run "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)" --print-logs${GH_AW_MODEL_DETECTION_OPENCODE:+ --model "$GH_AW_MODEL_DETECTION_OPENCODE"} 2>&1 | tee /tmp/gh-aw/threat-detection/detection.log
         env:
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           GH_AW_MODEL_DETECTION_OPENCODE: ${{ vars.GH_AW_MODEL_DETECTION_OPENCODE || '' }}
diff --git a/.github/workflows/smoke-opencode.lock.yml b/.github/workflows/smoke-opencode.lock.yml
index b1c5bbe1e7..f972d4ad41 100644
--- a/.github/workflows/smoke-opencode.lock.yml
+++ b/.github/workflows/smoke-opencode.lock.yml
@@ -880,7 +880,7 @@ jobs:
         run: |
           set -o pipefail
                     # Execute OpenCode CLI with prompt from file
-                    NODE_BIN_PATH="$(find /opt/hostedtoolcache/node -mindepth 1 -maxdepth 1 -type d | head -1 | xargs basename)/x64/bin" && export PATH="/opt/hostedtoolcache/node/$NODE_BIN_PATH:$PATH" && opencode run "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)" --print-logs${GH_AW_MODEL_AGENT_OPENCODE:+ --model "$GH_AW_MODEL_AGENT_OPENCODE"} 2>&1 | tee /tmp/gh-aw/agent-stdio.log
+                    opencode run "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)" --print-logs${GH_AW_MODEL_AGENT_OPENCODE:+ --model "$GH_AW_MODEL_AGENT_OPENCODE"} 2>&1 | tee /tmp/gh-aw/agent-stdio.log
         env:
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           GH_AW_MCP_CONFIG: /tmp/gh-aw/mcp-config/mcp-servers.json
@@ -1209,7 +1209,7 @@ jobs:
         run: |
           set -o pipefail
                     # Execute OpenCode CLI with prompt from file
-                    NODE_BIN_PATH="$(find /opt/hostedtoolcache/node -mindepth 1 -maxdepth 1 -type d | head -1 | xargs basename)/x64/bin" && export PATH="/opt/hostedtoolcache/node/$NODE_BIN_PATH:$PATH" && opencode run "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)" --print-logs${GH_AW_MODEL_DETECTION_OPENCODE:+ --model "$GH_AW_MODEL_DETECTION_OPENCODE"} 2>&1 | tee /tmp/gh-aw/threat-detection/detection.log
+                    opencode run "$(cat /tmp/gh-aw/aw-prompts/prompt.txt)" --print-logs${GH_AW_MODEL_DETECTION_OPENCODE:+ --model "$GH_AW_MODEL_DETECTION_OPENCODE"} 2>&1 | tee /tmp/gh-aw/threat-detection/detection.log
         env:
           ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           GH_AW_MODEL_DETECTION_OPENCODE: ${{ vars.GH_AW_MODEL_DETECTION_OPENCODE || '' }}
diff --git a/pkg/workflow/opencode_engine.go b/pkg/workflow/opencode_engine.go
index 315c7ad1a9..9956622415 100644
--- a/pkg/workflow/opencode_engine.go
+++ b/pkg/workflow/opencode_engine.go
@@ -179,9 +179,7 @@ func (e *OpenCodeEngine) GetExecutionSteps(workflowData *WorkflowData, logFile s
 
 	opencodeCommand := shellJoinArgs(commandParts)
 
-	// Prepend PATH setup to find opencode in hostedtoolcache
-	pathSetup := `NODE_BIN_PATH="$(find /opt/hostedtoolcache/node -mindepth 1 -maxdepth 1 -type d | head -1 | xargs basename)/x64/bin" && export PATH="/opt/hostedtoolcache/node/$NODE_BIN_PATH:$PATH"`
-	opencodeCommand = fmt.Sprintf(`%s && %s`, pathSetup, opencodeCommand)
+	// Note: No PATH setup needed - actions/setup-node automatically adds npm global bin to PATH
 
 	// Add conditional model flag if not explicitly configured
 	isDetectionJob := workflowData.SafeOutputs == nil