diff --git a/build.gradle.kts b/build.gradle.kts
index 93d838b..909ed14 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
   id("org.hypertrace.publish-plugin") version "1.1.1" apply false
   id("org.hypertrace.jacoco-report-plugin") version "0.3.0" apply false
   id("org.hypertrace.code-style-plugin") version "2.1.2" apply false
+  id("org.hypertrace.java-convention") version "0.4.0"
   id("org.owasp.dependencycheck") version "12.1.0"
 }
 
@@ -19,9 +20,6 @@ subprojects {
   }
   pluginManager.withPlugin("java") {
     configure<JavaPluginExtension> {
-      sourceCompatibility = JavaVersion.VERSION_11
-      targetCompatibility = JavaVersion.VERSION_11
-
       apply(plugin = "org.hypertrace.code-style-plugin")
     }
   }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 40bd02f..daa5302 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,3 +1,3 @@
 [libraries]
-lombok = { module = "org.projectlombok:lombok", version = "1.18.30" }
-hypertrace-documentStore = { module = "org.hypertrace.core.documentstore:document-store", version = "0.9.1" }
+lombok = { module = "org.projectlombok:lombok", version = "1.18.38" }
+hypertrace-documentStore = { module = "org.hypertrace.core.documentstore:document-store", version = "0.9.5" }
diff --git a/platform-grpc-service-framework/build.gradle.kts b/platform-grpc-service-framework/build.gradle.kts
index 217ba24..34a4977 100644
--- a/platform-grpc-service-framework/build.gradle.kts
+++ b/platform-grpc-service-framework/build.gradle.kts
@@ -15,8 +15,8 @@ dependencies {
   api("com.google.protobuf:protobuf-java:3.25.5")
   api(project(":service-framework-spi"))
 
-  annotationProcessor("org.projectlombok:lombok:1.18.24")
-  compileOnly("org.projectlombok:lombok:1.18.24")
+  annotationProcessor(libs.lombok)
+  compileOnly(libs.lombok)
 
   implementation(project(":platform-metrics"))
   implementation("io.grpc:grpc-inprocess")
diff --git a/platform-http-service-framework/build.gradle.kts b/platform-http-service-framework/build.gradle.kts
index 475a5c3..7151e61 100644
--- a/platform-http-service-framework/build.gradle.kts
+++ b/platform-http-service-framework/build.gradle.kts
@@ -18,6 +18,6 @@ dependencies {
   implementation("org.eclipse.jetty:jetty-servlet:11.0.24")
   implementation("org.eclipse.jetty:jetty-server:11.0.24")
   implementation("org.eclipse.jetty:jetty-servlets:11.0.24")
-  annotationProcessor("org.projectlombok:lombok:1.18.24")
-  compileOnly("org.projectlombok:lombok:1.18.24")
+  annotationProcessor(libs.lombok)
+  compileOnly(libs.lombok)
 }
diff --git a/platform-hybrid-service-framework/build.gradle.kts b/platform-hybrid-service-framework/build.gradle.kts
index 2d3b041..b48047a 100644
--- a/platform-hybrid-service-framework/build.gradle.kts
+++ b/platform-hybrid-service-framework/build.gradle.kts
@@ -10,6 +10,6 @@ dependencies {
   api(project(":platform-http-service-framework"))
   api(project(":platform-service-framework"))
 
-  annotationProcessor("org.projectlombok:lombok:1.18.24")
-  compileOnly("org.projectlombok:lombok:1.18.24")
+  annotationProcessor(libs.lombok)
+  compileOnly(libs.lombok)
 }