diff --git a/.github/workflows/java18.yml b/.github/workflows/java18.yml
index fd25877..f2f8b34 100644
--- a/.github/workflows/java18.yml
+++ b/.github/workflows/java18.yml
@@ -19,7 +19,7 @@ jobs:
           distribution: 'zulu'
       - name: Switch To Maven 3
         run: |
-          echo "distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.zip" > .mvn/wrapper/maven-wrapper.properties
+          echo "distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip" > .mvn/wrapper/maven-wrapper.properties
           echo "wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" >> .mvn/wrapper/maven-wrapper.properties
       - name: Build with Maven
         run: ./mvnw --batch-mode --update-snapshots install -Prun-its
diff --git a/.github/workflows/java19.yml b/.github/workflows/java19.yml
index 8f31970..d477b51 100644
--- a/.github/workflows/java19.yml
+++ b/.github/workflows/java19.yml
@@ -19,7 +19,7 @@ jobs:
           distribution: 'temurin'
       - name: Switch To Maven 3
         run: |
-          echo "distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.zip" > .mvn/wrapper/maven-wrapper.properties
+          echo "distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip" > .mvn/wrapper/maven-wrapper.properties
           echo "wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" >> .mvn/wrapper/maven-wrapper.properties
       - name: Build with Maven
         run: ./mvnw --batch-mode --update-snapshots install -Prun-its
diff --git a/.github/workflows/java20.yml b/.github/workflows/java20.yml
index 4b84dca..342aca5 100644
--- a/.github/workflows/java20.yml
+++ b/.github/workflows/java20.yml
@@ -1,4 +1,4 @@
-name: Integration Tests on Java 19
+name: Integration Tests on Java 20
 
 on:
   push:
@@ -19,7 +19,7 @@ jobs:
           distribution: 'temurin'
       - name: Switch To Maven 3
         run: |
-          echo "distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.zip" > .mvn/wrapper/maven-wrapper.properties
+          echo "distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip" > .mvn/wrapper/maven-wrapper.properties
           echo "wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" >> .mvn/wrapper/maven-wrapper.properties
       - name: Build with Maven
         run: ./mvnw --batch-mode --update-snapshots install -Prun-its
diff --git a/.github/workflows/java21.yml b/.github/workflows/java21.yml
new file mode 100644
index 0000000..48b367d
--- /dev/null
+++ b/.github/workflows/java21.yml
@@ -0,0 +1,25 @@
+name: Integration Tests on Java 21
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: 21
+          distribution: 'temurin'
+      - name: Switch To Maven 3
+        run: |
+          echo "distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip" > .mvn/wrapper/maven-wrapper.properties
+          echo "wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" >> .mvn/wrapper/maven-wrapper.properties
+      - name: Build with Maven
+        run: ./mvnw --batch-mode --update-snapshots install -Prun-its
diff --git a/.github/workflows/java8.yml b/.github/workflows/java8.yml
index 9d5d5f3..c7ea8a6 100644
--- a/.github/workflows/java8.yml
+++ b/.github/workflows/java8.yml
@@ -1,4 +1,4 @@
-name: Integration Tests on Java 8 and Maven 3.9.1
+name: Integration Tests on Java 8 and Maven 3.9.5
 
 on:
   push:
@@ -19,7 +19,7 @@ jobs:
           java-version: 8
       - name: Switch To Maven 3
         run: |
-          echo "distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.zip" > .mvn/wrapper/maven-wrapper.properties
+          echo "distributionUrl=https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip" > .mvn/wrapper/maven-wrapper.properties
           echo "wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" >> .mvn/wrapper/maven-wrapper.properties
       - name: Build with Maven
         run: ./mvnw --batch-mode --update-snapshots install -Prun-its
diff --git a/.github/workflows/java8_m4.yml b/.github/workflows/java8_m4.yml
index dee7371..536c287 100644
--- a/.github/workflows/java8_m4.yml
+++ b/.github/workflows/java8_m4.yml
@@ -1,4 +1,4 @@
-name: Integration Tests on Java 8 and Maven 4.0.0-alpha-5
+name: Integration Tests on Java 8 and Maven 4.0.0-alpha-7
 
 on:
   push: