diff --git a/.github/workflows/maven.yml b/.github/workflows/java-17.yml
similarity index 93%
rename from .github/workflows/maven.yml
rename to .github/workflows/java-17.yml
index 58f10a8..22853f0 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/java-17.yml
@@ -1,4 +1,4 @@
-name: Java CI with Maven
+name: Java 17 CI with Maven
 
 on:
   push:
diff --git a/.github/workflows/java-21.yml b/.github/workflows/java-21.yml
new file mode 100644
index 0000000..add66f4
--- /dev/null
+++ b/.github/workflows/java-21.yml
@@ -0,0 +1,24 @@
+name: Java 21 CI with Maven
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+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'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+