diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2490a17..c84a53b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -27,6 +27,10 @@ jobs:
         os: [ubuntu-latest,windows-latest, macOS-latest]
         java: [8, 11, 17]
         jdk: [temurin, zulu, adopt-openj9]
+        include:
+          - os: ubuntu-latest
+            java: 21
+            jdk: corretto
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
diff --git a/pom.xml b/pom.xml
index 2ddc848..02cf2dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,5 +104,28 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- TODO remove with parent pom or spotless plugin update https://github.com/diffplug/spotless/issues/1774 -->
+    <profile>
+      <id>java21+</id>
+      <activation>
+        <jdk>[21,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.diffplug.spotless</groupId>
+            <artifactId>spotless-maven-plugin</artifactId>
+            <configuration>
+              <java>
+                <palantirJavaFormat>
+                  <version>2.35.0</version>
+                </palantirJavaFormat>
+              </java>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>