diff --git a/.github/workflows/claude-review.yml b/.github/workflows/claude-review.yml
index 4e82edfe..5a29ec39 100644
--- a/.github/workflows/claude-review.yml
+++ b/.github/workflows/claude-review.yml
@@ -28,7 +28,7 @@ jobs:
         uses: anthropics/claude-code-action@v1
         with:
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
-          claude_args: "--max-turns 50 --model claude-sonnet-4-6 --allowedTools 'Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh issue view:*),Bash(gh issue list:*),Bash(gh search:*),Bash(git blame:*),Bash(git log:*),Bash(git diff:*)'"
+          claude_args: "--max-turns 50 --model claude-haiku-4-5-20251001 --allowedTools 'Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*),Bash(gh issue view:*),Bash(gh issue list:*),Bash(gh search:*),Bash(git blame:*),Bash(git log:*),Bash(git diff:*)'"
           prompt: |
             Code review this pull request. Follow these steps precisely:
 
diff --git a/.github/workflows/staging-ci.yml b/.github/workflows/staging-ci.yml
index 6d72f0bd..d50db2b1 100644
--- a/.github/workflows/staging-ci.yml
+++ b/.github/workflows/staging-ci.yml
@@ -261,7 +261,7 @@ jobs:
           fi
 
           echo "Polling for Claude Code Review job on PR #${PR_NUMBER} (SHA: ${PR_SHA})..."
-          TIMEOUT=1200  # 20 minutes
+          TIMEOUT=1800  # 30 minutes
           ELAPSED=0
           INTERVAL=30
 
@@ -375,8 +375,8 @@ jobs:
         env:
           PR_NUMBER: ${{ needs.create-promotion-pr.outputs.pr_number }}
           SKIP_GATE: ${{ inputs.skip_claude_gate }}
+          HAS_BLOCKING: ${{ steps.process-findings.outputs.has_blocking }}
         run: |
-          HAS_BLOCKING="${{ steps.process-findings.outputs.has_blocking }}"
           SKIP_INPUT="$SKIP_GATE"
 
           if [ "$HAS_BLOCKING" = "true" ]; then