diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1e05093e..3b6615fe 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,11 +30,11 @@ jobs:
           - 8
           - 11
           - 17
+          - 21
         # Support 1-year-old version + latest minor
         maven:
-          - 3.8.5
           - 3.8.8
-          - 3.9.2
+          - 3.9.6
     runs-on: ${{ matrix.os }}
     steps:
       - uses: s4u/setup-maven-action@v1.7.0
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 8f30ce1f..7ffcb7f3 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -50,6 +50,7 @@ Build / Infrastructure::
   * Bump Maven build plugins (#623)
   * Bump GH 'checkout' and 'setup-java' to v3 (#624)
   * Bump Doxia to v1.12.0 and maven-site-plugin in IT to 3.12.1 (#625)
+  * Support Java 21 (#684)
 
 Documentation::
 
diff --git a/pom.xml b/pom.xml
index 0e2394f0..a38c7aed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.24</version>
+            <version>1.18.30</version>
             <scope>test</scope>
         </dependency>
     </dependencies>