diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a6e39bf..1cfe2399 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,35 +20,33 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Set up multiple JDKs
+      - name: Set up JDK 16
         uses: actions/setup-java@v4
         with:
-          java-version: |
-            16
-            17
-            21
+          java-version: 16
           distribution: 'adopt'
 
-      - name: Set Java 16 for Spigot 1.16.5
-        run: |
-          echo "JAVA_HOME=$JAVA_HOME_16_X64" >> $GITHUB_ENV
-          echo "PATH=$JAVA_HOME_16_X64/bin:$PATH" >> $GITHUB_ENV
-
       - name: Compile Minecraft Spigot 1.16.5 (via BuildTools)
         uses: SpraxDev/Action-SpigotMC@v5.1.0
         with:
           versions: "1.16.5"
 
-      - name: Set Java 17 for Spigot 1.17.1
-        run: |
-          echo "JAVA_HOME=$JAVA_HOME_17_X64" >> $GITHUB_ENV
-          echo "PATH=$JAVA_HOME_17_X64/bin:$PATH" >> $GITHUB_ENV
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'adopt'
 
       - name: Compile Minecraft Spigot 1.17.1 (via BuildTools)
         uses: SpraxDev/Action-SpigotMC@v5.1.0
         with:
           versions: "1.17.1"
 
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'adopt'
 
       - name: Build with Gradle
         run: ./gradlew build