diff --git a/pom.xml b/pom.xml
index f94db23..8b6ce49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -598,5 +598,28 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- TODO revert it with spotless plugin update with fix for 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.36.0</version>
+                </palantirJavaFormat>
+              </java>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>