diff --git a/.appveyor.yml b/.appveyor.yml
index 4c6ed45d..7d98a5f1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,8 +9,8 @@ environment:
   APPVEYOR_CACHE_ENTRY_ZIP_ARGS: -t7z -mx0 -mmt=0 -snl -snh
   MAVEN_OPTS: "-Dmaven.repo.local=C:/Users/appveyor/.m2"
   matrix:
-  - JAVA_HOME: "C:/Program Files/Java/jdk11"
-  - JAVA_HOME: "C:/Program Files/Java/jdk12"
+  - JAVA_HOME: "C:/Program Files/Java/jdk17"
+  - JAVA_HOME: "C:/Program Files/Java/jdk21"
 
 cache:
   - C:\Users\appveyor\.m2 -> pom.xml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 42a9293f..9e4ee58d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         distribution: [ temurin, corretto ]
-        java-version: [ 11, 17 ]
+        java-version: [ 17, 21 ]
 
     steps:
       - name: Checkout
@@ -36,25 +36,25 @@ jobs:
           java-version: ${{ matrix.java-version }}
           distribution: ${{ matrix.distribution }}
 
-      - name: Build and deploy with Maven and analyze with Sonar
-        # Deploy and analyze only the Corretto 11 build
+      - name: Build with Maven and analyze with Sonar
+        # Analyze only the Corretto 17 build with Sonar
         if: matrix.distribution == 'corretto' && matrix.java-version == '17'
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         # The value of sonar.projectKey is generated by Sonar and needs to map to its internal project name
         run: mvn -B --update-snapshots -Dmaven.test.failure.ignore=true package org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=parsingdata_metal -Dsonar.organization=parsingdata
 
-      - name: Build and deploy with Maven
+      - name: Deploy with Maven
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: matrix.distribution == 'corretto' && matrix.java-version == '11'
+        if: matrix.distribution == 'corretto' && matrix.java-version == '17'
         run: mvn -B --update-snapshots -Dmaven.test.failure.ignore=true deploy
 
       - name: Build with Maven
-        if: matrix.distribution != 'corretto'
+        if: matrix.distribution != 'corretto' || matrix.java-version != '17'
         run: mvn -B --update-snapshots -Dmaven.test.failure.ignore=true package
 
       - name: Upload Code Coverage to Codecov
         # Upload test coverage results only from the Corretto 11 build
-        if: matrix.distribution == 'corretto' && matrix.java-version == '11'
+        if: matrix.distribution == 'corretto' && matrix.java-version == '17'
         uses: codecov/codecov-action@v4
diff --git a/pom.xml b/pom.xml
index cddaa22d..ff73222f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.12.1</version>
         <configuration>
-          <release>11</release>
+          <release>17</release>
         </configuration>
       </plugin>
       <plugin>