diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6153eeab74..3af54fb610 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -193,6 +193,19 @@ jobs:
     needs: [build-docker, build-host, build-documentation]
     runs-on: ubuntu-22.04
     steps:
+      - name: Free Disk Space
+        if: |
+          github.repository_owner == 'wpilibsuite' &&
+          (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: false
+          docker-images: false
+          swap-storage: false
       - uses: actions/checkout@v3
         if: |
           github.repository_owner == 'wpilibsuite' &&
@@ -223,7 +236,7 @@ jobs:
           (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - name: Combine (Main)
         if: |
           github.repository_owner == 'wpilibsuite' &&