diff --git a/config-service-change-event-generator/build.gradle.kts b/config-service-change-event-generator/build.gradle.kts
index f130bc9e..de05e14f 100644
--- a/config-service-change-event-generator/build.gradle.kts
+++ b/config-service-change-event-generator/build.gradle.kts
@@ -19,12 +19,21 @@ dependencies {
 
   runtimeOnly(libs.kafka.protobuf.serializer)
   constraints {
-    runtimeOnly("org.glassfish.jersey.core:jersey-common:2.34") {
+    implementation(libs.jersey.common) {
       because("https://snyk.io/vuln/SNYK-JAVA-ORGGLASSFISHJERSEYCORE-1255637")
     }
-    runtimeOnly("org.apache.commons:commons-compress:1.21") {
+    implementation(libs.commons.compress) {
       because("Multiple vulnerabilities")
     }
+    implementation(libs.kotlin.stdlib) {
+      because("https://nvd.nist.gov/vuln/detail/CVE-2020-29582")
+    }
+    implementation(libs.kotlin.stdlibJdk7) {
+      because("https://nvd.nist.gov/vuln/detail/CVE-2020-29582")
+    }
+    implementation(libs.kotlin.stdlibJdk8) {
+      because("https://nvd.nist.gov/vuln/detail/CVE-2020-29582")
+    }
   }
 
   testImplementation(libs.junit.jupiter)
diff --git a/config-service/build.gradle.kts b/config-service/build.gradle.kts
index fb716af1..d64b130d 100644
--- a/config-service/build.gradle.kts
+++ b/config-service/build.gradle.kts
@@ -73,8 +73,8 @@ dependencies {
   runtimeOnly(libs.slf4j.log4jimpl)
   runtimeOnly(libs.grpc.netty)
   constraints {
-    runtimeOnly("io.netty:netty-codec-http2:4.1.68.Final")
-    runtimeOnly("io.netty:netty-handler-proxy:4.1.68.Final")
+    runtimeOnly(libs.netty.codecHttp2)
+    runtimeOnly(libs.netty.handlerProxy)
   }
 
   // Integration test dependencies
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 547617c1..88ab2472 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,6 +7,8 @@ hypertrace-framework = "0.1.29"
 lombok = "1.18.20"
 jackson = "2.12.4"
 confluent = "6.0.1"
+netty = "4.1.68.Final"
+kotlin = "1.4.32"
 
 junit = "5.7.2"
 mockito = "3.11.2"
@@ -24,7 +26,7 @@ hypertrace-framework-metrics = { module = "org.hypertrace.core.serviceframework:
 hypertrace-framework-integrationtest = { module = "org.hypertrace.core.serviceframework:integrationtest-service-framework", version.ref = "hypertrace-framework" }
 
 hypertrace-documentstore = { module = "org.hypertrace.core.documentstore:document-store", version = "0.5.7" }
-hypertrace-eventstore = { module = "org.hypertrace.core.eventstore:event-store", version = "0.1.2"}
+hypertrace-eventstore = { module = "org.hypertrace.core.eventstore:event-store", version = "0.1.2" }
 
 guava = { module = "com.google.guava:guava", version = "30.1.1-jre" }
 javax-annotation = { module = "javax.annotation:javax.annotation-api", version = "1.3.2" }
@@ -32,7 +34,7 @@ typesafe-config = { module = "com.typesafe:config", version = "1.4.1" }
 lombok = { module = "org.projectlombok:lombok", version = "1.18.20" }
 snakeyaml = { module = "org.yaml:snakeyaml", version = "1.28" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
-rxjava3 = {module = "io.reactivex.rxjava3:rxjava", version ="3.0.11"}
+rxjava3 = { module = "io.reactivex.rxjava3:rxjava", version = "3.0.11" }
 
 grpc-protobuf = { module = "io.grpc:grpc-protobuf", version.ref = "grpc" }
 grpc-stub = { module = "io.grpc:grpc-stub", version.ref = "grpc" }
@@ -42,8 +44,15 @@ grpc-netty = { module = "io.grpc:grpc-netty", version.ref = "grpc" }
 protobuf-javautil = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc" }
 protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protoc" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+netty-codecHttp2 = { module = "io.netty:netty-codec-http2", version.ref = "netty" }
+netty-handlerProxy = { module = "io.netty:netty-handler-proxy", version.ref = "netty" }
 
 kafka-protobuf-serializer = { module = "io.confluent:kafka-protobuf-serializer", version.ref = "confluent" }
+kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
+kotlin-stdlibJdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
+kotlin-stdlibJdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+commons-compress = { module = "org.apache.commons:commons-compress", version = "1.21" }
+jersey-common = { module = "org.glassfish.jersey.core:jersey-common", version = "2.34" }
 
 slf4j-log4jimpl = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version = "2.14.1" }
 slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.30" }