diff --git a/buildSrc/src/main/groovy/airbyte-java-connector.gradle b/buildSrc/src/main/groovy/airbyte-java-connector.gradle
index d7626c8e5f11..81a4c40d7d89 100644
--- a/buildSrc/src/main/groovy/airbyte-java-connector.gradle
+++ b/buildSrc/src/main/groovy/airbyte-java-connector.gradle
@@ -60,12 +60,24 @@ class AirbyteJavaConnectorExtension {
             def testFixturesDep = { useLocalCdk ? testFixtures(project.project(projectName(it))) : "${jarName(it)}:test-fixtures" }
             if (useLocalCdk || !cdkVersionRequired.matches("^0\\.[0-9]\\..*|^0\\.1[0-8]\\..*")) {
                 // v0.19+ module structure
+                compileOnly "org.projectlombok:lombok:1.18.30"
+                annotationProcessor "org.projectlombok:lombok:1.18.30"     // Lombok must be added BEFORE Micronaut
+                testCompileOnly "org.projectlombok:lombok:1.18.30"
+                testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
+                testFixturesCompileOnly "org.projectlombok:lombok:1.18.30"
+                testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
                 implementation dep("dependencies")
                 testImplementation dep("dependencies")
                 testFixturesImplementation dep("dependencies")
                 integrationTestJavaImplementation dep("dependencies")
                 integrationTestJavaImplementation testFixturesDep("dependencies")
             } else {
+                compileOnly "org.projectlombok:lombok:1.18.30"
+                annotationProcessor "org.projectlombok:lombok:1.18.30"     // Lombok must be added BEFORE Micronaut
+                testCompileOnly "org.projectlombok:lombok:1.18.30"
+                testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
+                testFixturesCompileOnly "org.projectlombok:lombok:1.18.30"
+                testAnnotationProcessor "org.projectlombok:lombok:1.18.30"
                 // pre-v0.19 module structure
                 implementation(platform("com.fasterxml.jackson:jackson-bom:2.13.0"))
                 implementation(platform("org.glassfish.jersey:jersey-bom:2.31"))
@@ -237,6 +249,7 @@ class AirbyteJavaConnectorPlugin implements Plugin<Project> {
             performanceTestJavaImplementation testFixtures(project)
         }
 
+
         project.extensions.create('airbyteJavaConnector', AirbyteJavaConnectorExtension, project)
     }
 }