diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66a4deb..96913dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -96,7 +96,7 @@ jobs:
       fail-fast: false
       matrix:
         mod-loader: ['fabric', 'forge']
-        mc-version: ['1.17.1', '1.18.1', '1.18.2', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20.1', "1.20.2", "1.20.4", "1.20.6"]
+        mc-version: ['1.17.1', '1.18.1', '1.18.2', '1.19', '1.19.2', '1.19.3', '1.19.4', '1.20.1', "1.20.2", "1.20.4"]
         #exclude:
         #  - mod-loader: 'forge'
         #    mc-version: '1.17'
@@ -146,6 +146,54 @@ jobs:
           name: ${{ matrix.mod-loader }} ${{ matrix.mc-version }}
           path: ./MinecraftMod/${{ matrix.mod-loader }}/${{ matrix.mc-version }}/build/libs/*.jar
 
+  buildJava21:
+    name: Build ${{ matrix.mod-loader }} ${{ matrix.mc-version }}
+    runs-on: ubuntu-latest
+    needs: buildCore
+            
+    # Matrix of jobs to run
+    strategy:
+      fail-fast: false
+      matrix:
+        mod-loader: ['fabric', 'forge']
+        mc-version: ["1.20.6"]
+        #exclude:
+        #  - mod-loader: 'forge'
+        #    mc-version: '1.17'
+                
+    steps:
+      # Checks-out the repository under $GITHUB_WORKSPACE, so the job can access it
+      - uses: actions/checkout@v4
+        
+      # Setup JDK
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: 21
+        
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v3
+        
+      # Download Core
+      - name: Download Core Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: maven
+          path: ~/.m2/repository
+          
+      # Build Minecraft Mod
+      - name: Build Mod
+        working-directory: ./MinecraftMod/${{ matrix.mod-loader }}/${{ matrix.mc-version }}
+        run: './gradlew build --no-daemon'
+        
+      # Upload Artifact
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ matrix.mod-loader }} ${{ matrix.mc-version }}
+          path: ./MinecraftMod/${{ matrix.mod-loader }}/${{ matrix.mc-version }}/build/libs/*.jar
+
   buildPlugin:
     name: Build Stream Deck Plugin
     runs-on: windows-latest