diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
index e65102e..e5b334b 100644
--- a/.github/workflows/code-quality.yml
+++ b/.github/workflows/code-quality.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '25'
+          java-version: '21'
       - name: Run Checkstyle
         run: mvn --batch-mode checkstyle:check
       - name: Annotate Checkstyle results
@@ -39,7 +39,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '25'
+          java-version: '21'
       - name: Build with coverage
         run: mvn --batch-mode clean verify
       - name: Upload coverage to Codecov
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index c01fb91..a7b7ac0 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [ '25' ]
+        java-version: [ '21', '25' ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
@@ -28,14 +28,14 @@ jobs:
       - name: Upload JAR artifact
         uses: actions/upload-artifact@v7
         with:
-          name: java-query-builder-jar
+          name: java-query-builder-jar-${{ matrix.java-version }}
           path: target/*.jar
 
   feature-tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [ '25' ]
+        java-version: [ '21', '25' ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
diff --git a/pom.xml b/pom.xml
index 6d7562d..60e7e09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
     <url>https://github.com/EzFramework/JavaQueryBuilder</url>
 
     <properties>
-        <maven.compiler.source>25</maven.compiler.source>
-        <maven.compiler.target>25</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -52,8 +52,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.15.0</version>
                 <configuration>
-                    <source>25</source>
-                    <target>25</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
             <plugin>