diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 118bf4b7e20..37a9e551efd 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -192,7 +192,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          repository: wpilibsuite/build-tools
+          repository: rzblue/build-tools
+          ref: update-everything
       - uses: actions/download-artifact@v3
         with:
           path: combiner/products/build/allOutputs
@@ -205,7 +206,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - name: Combine
         if: |
           !startsWith(github.ref, 'refs/tags/v') &&