diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca14d6c9..c58a6fea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,18 +19,15 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0 # needed for versioning
-      - name: Set up JDK 1.17
-        uses: actions/setup-java@v1
+      - name: Set up Java
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: "${{ runner.os }}-bluemap-${{ hashFiles('**/*.gradle*') }}"
-          restore-keys: |
-            ${{ runner.os }}-bluemap-
+          distribution: 'temurin'
+          java-version: |
+            11
+            16
+            17
+          cache: 'gradle'
       - name: Build with Gradle
         run: ./gradlew clean spotlessCheck test build
       - uses: actions/upload-artifact@v2
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5fdac2ce..36aa7872 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,18 +11,15 @@ jobs:
         with:
           submodules: recursive
           fetch-depth: 0 # needed for versioning
-      - name: Set up JDK 1.17
-        uses: actions/setup-java@v1
+      - name: Set up Java
+        uses: actions/setup-java@v3
         with:
-          java-version: 17
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: "${{ runner.os }}-bluemap-${{ hashFiles('**/*.gradle*') }}"
-          restore-keys: |
-            ${{ runner.os }}-bluemap-
+          distribution: 'temurin'
+          java-version: |
+            11
+            16
+            17
+          cache: 'gradle'
       - name: Build with Gradle
         env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
diff --git a/implementations/forge-1.17.1/build.gradle b/implementations/forge-1.17.1/build.gradle
index 038bc301..a4a475c3 100644
--- a/implementations/forge-1.17.1/build.gradle
+++ b/implementations/forge-1.17.1/build.gradle
@@ -29,6 +29,10 @@ def javaTarget = 16
 java {
 	sourceCompatibility = JavaVersion.toVersion(javaTarget)
 	targetCompatibility = JavaVersion.toVersion(javaTarget)
+
+	toolchain {
+		languageVersion.set(JavaLanguageVersion.of(17))
+	}
 }
 
 minecraft {