diff --git a/.github/workflows/claude-wif-test.yaml b/.github/workflows/claude-wif-test.yaml
index 2e392ded07a5..868ddf61d6f1 100644
--- a/.github/workflows/claude-wif-test.yaml
+++ b/.github/workflows/claude-wif-test.yaml
@@ -16,9 +16,12 @@ jobs:
       github.event_name == 'workflow_dispatch' ||
       (github.event.issue.pull_request &&
        contains(github.event.comment.body, '/test-wif') &&
-       github.event.comment.author_association == 'MEMBER' ||
-       github.event.comment.author_association == 'OWNER')
+       (github.event.comment.author_association == 'MEMBER' ||
+        github.event.comment.author_association == 'OWNER' ||
+        github.event.comment.author_association == 'COLLABORATOR'))
     runs-on: arc-runner-set
+    container:
+      image: quay.io/rh_ee_brcox/hypershift:ai-helpers-arm64
     timeout-minutes: 10
     steps:
       - name: Get PR ref
@@ -36,11 +39,6 @@ jobs:
           repository: ${{ steps.pr.outputs.repo || github.repository }}
           persist-credentials: false
 
-      - name: Install Claude Code
-        run: |
-          curl -fsSL https://claude.ai/install.sh | bash
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
       - name: Authenticate to GCP via WIF
         uses: google-github-actions/auth@c200f3691d83b41bf9bbd8638997a462592937ed # v2
         with:
@@ -55,4 +53,4 @@ jobs:
           ANTHROPIC_VERTEX_PROJECT_ID: hosted-control-planes
         run: |
           claude --version
-          claude -p "Say hello in one sentence" --max-turns 1
+          claude -p "/hello-world:echo HyperShift" --max-turns 1