diff --git a/.github/workflows/_build_plugin.yml b/.github/workflows/_build_plugin.yml
index 4d2230afd7a..f95aaf03c9d 100644
--- a/.github/workflows/_build_plugin.yml
+++ b/.github/workflows/_build_plugin.yml
@@ -41,8 +41,8 @@ jobs:
         shell: bash
         run: |
           cd pytorch/xla/infra/ansible
-          apt install clang-17
-          echo 'which clang++'
+          apt install -y clang
+          bazel clean --expunge || true
           ansible-playbook playbook.yaml -vvv -e "stage=build_plugin arch=amd64 accelerator=cuda cuda_compute_capabilities=5.2,7.5,8.6 src_root=${GITHUB_WORKSPACE} cache_suffix=-ci" --skip-tags=fetch_srcs,install_deps
       - name: Upload wheel
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/_build_torch_xla.yml b/.github/workflows/_build_torch_xla.yml
index 163a8253a04..5c7676f7395 100644
--- a/.github/workflows/_build_torch_xla.yml
+++ b/.github/workflows/_build_torch_xla.yml
@@ -47,8 +47,8 @@ jobs:
         shell: bash
         run: |
           cd pytorch/xla/infra/ansible
-          apt install clang-17
-          echo 'which clang++'
+          apt install -y clang
+          bazel clean --expunge || true
           ansible-playbook playbook.yaml -vvv -e "stage=build arch=amd64 accelerator=tpu src_root=${GITHUB_WORKSPACE} bundle_libtpu=0 build_cpp_tests=1 git_versioned_xla_build=1 cache_suffix=-ci" --skip-tags=fetch_srcs,install_deps
       - name: Upload wheel
         uses: actions/upload-artifact@v4