diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f1ef43de..e8c8578af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,7 @@ jobs:
         include:
           - { name: "default", javaVersion: 8 }
           - { name: "default", javaVersion: 17 }
+          - { name: "default", javaVersion: 21 }
           - { name: "over TCP", dockerHost: "tcp://127.0.0.1:2375", javaVersion: 8 }
           - { name: "Docker 19.03.9", dockerVersion: "5:19.03.9~3-0~ubuntu-focal", javaVersion: 8 }
 
diff --git a/docker-java-api/pom.xml b/docker-java-api/pom.xml
index da19bba47..82d176e38 100644
--- a/docker-java-api/pom.xml
+++ b/docker-java-api/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.22</version>
+			<version>1.18.30</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/docker-java/pom.xml b/docker-java/pom.xml
index 39e1b1b65..e3c3690f1 100644
--- a/docker-java/pom.xml
+++ b/docker-java/pom.xml
@@ -141,7 +141,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.22</version>
+			<version>1.18.30</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>