diff --git a/.github/workflows/_build_torch_xla.yml b/.github/workflows/_build_torch_xla.yml
index 83f6035f0f1..8a9f9f07cee 100644
--- a/.github/workflows/_build_torch_xla.yml
+++ b/.github/workflows/_build_torch_xla.yml
@@ -31,8 +31,12 @@ jobs:
       BAZEL_JOBS: 16
       BUILD_CPP_TESTS: 1
     steps:
+      - name: Checkout PyTorch/XLA Repo
+        uses: actions/checkout@v4
+        with:
+          path: pytorch/xla
       - name: Setup
-        uses: ./.github/workflows/_setup.yml
+        uses: ./pytorch/xla/.github/workflows/_setup.yml
         with:
           torch-commit: ${{ inputs.torch-commit }}
           setup-remote-cache: ${{ env.BAZEL_REMOTE_CACHE }}
diff --git a/.github/workflows/_setup.yml b/.github/workflows/_setup.yml
index 13fed90829d..503532d6a35 100644
--- a/.github/workflows/_setup.yml
+++ b/.github/workflows/_setup.yml
@@ -1,7 +1,6 @@
 name: Set up PyTorch/XLA
 inputs:
   torch-commit:
-    required: true
     type: string
   remote-cache:
     required: true
@@ -28,7 +27,4 @@ runs:
         path: pytorch
         ref: ${{ inputs.torch-commit }}
         submodules: recursive
-    - name: Checkout PyTorch/XLA Repo
-      uses: actions/checkout@v4
-      with:
-        path: pytorch/xla
+      if: ${{ inputs.torch-commit }}