diff --git a/pom.xml b/pom.xml
index b5e5b1de..7be23837 100755
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 
 	<properties>
 		<dev>/dev</dev>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<jmolecules.version>2023.1.4</jmolecules.version>
 		<spring-modulith.version>1.2.4-SNAPSHOT</spring-modulith.version>
 		<spring-asciidoctor-backends.version>0.0.7</spring-asciidoctor-backends.version>
@@ -325,6 +325,14 @@
 					<addOutputDirectory>false</addOutputDirectory>
 					<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
 				</configuration>
+				<dependencies>
+					<!-- Override plugins default version with the lombok version used during compilation -->
+					<dependency>
+						<groupId>org.projectlombok</groupId>
+						<artifactId>lombok</artifactId>
+						<version>${lombok.version}</version>
+					</dependency>
+				</dependencies>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>