diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4c45e66..dcc66ca 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ hypertrace-attributeservice = "0.14.35"
 hypertrace-gatewayservice = "0.3.9"
 hypertrace-entityservice = "0.8.86"
 hypertrace-configservice = "0.1.74"
-jetty = "11.0.26"
+jetty = "12.1.9"
 netty = "4.1.132.Final"
 
 junit = "5.10.0"
@@ -41,11 +41,12 @@ jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }
 jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" }
 jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8" }
 jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version = "2.0.1" }
-jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.0.0" }
+jakarta-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version = "6.1.0" }
 jetty-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty" }
-jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet" }
+jetty-ee10-bom = { module = "org.eclipse.jetty.ee10:jetty-ee10-bom", version.ref = "jetty" }
+jetty-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "jetty" }
 jetty-server = { module = "org.eclipse.jetty:jetty-server" }
-jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets" }
+jetty-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "jetty" }
 netty-bom = { module = "io.netty:netty-bom", version.ref = "netty" }
 protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protoc" }
 protobuf-javautil = { module = "com.google.protobuf:protobuf-java-util", version.ref = "protoc" }
diff --git a/hypertrace-bom/build.gradle.kts b/hypertrace-bom/build.gradle.kts
index 7b976a5..97b8374 100644
--- a/hypertrace-bom/build.gradle.kts
+++ b/hypertrace-bom/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
   api(platform(libs.jackson.bom))
   api(platform(libs.hypertrace.kafka.bom))
   api(platform(libs.jetty.bom))
+  api(platform(libs.jetty.ee10.bom))
   api(platform(libs.netty.bom))
   constraints {
     api(libs.hypertrace.grpcutils.context)
diff --git a/test-consumer/build.gradle.kts b/test-consumer/build.gradle.kts
index 5f37e93..6562069 100644
--- a/test-consumer/build.gradle.kts
+++ b/test-consumer/build.gradle.kts
@@ -9,12 +9,13 @@ dependencies {
   api(libs.hypertrace.grpcutils.server)
   api(libs.hypertrace.grpcutils.rx.client)
   api(libs.hypertrace.grpcutils.rx.server)
-  api(libs.hypertrace.framework.grpc)
-  api(libs.hypertrace.framework.http)
-  api(libs.hypertrace.framework.spi)
-  api(libs.hypertrace.kafka.framework)
-  api(libs.hypertrace.integrationtest.framework)
-  api(libs.hypertrace.framework.documentstore.metrics)
+  // TODO: uncomment after publishing service-framework with Jetty 12
+  // api(libs.hypertrace.framework.grpc)
+  // api(libs.hypertrace.framework.http)
+  // api(libs.hypertrace.framework.spi)
+  // api(libs.hypertrace.kafka.framework)
+  // api(libs.hypertrace.integrationtest.framework)
+  // api(libs.hypertrace.framework.documentstore.metrics)
   api(libs.hypertrace.documentstore)
   api(libs.hypertrace.eventstore)
   api(libs.hypertrace.attributeservice.api)
@@ -57,11 +58,12 @@ dependencies {
   api(libs.commons.text)
   api(libs.graphql.java)
   api(libs.jsr305)
-  api(libs.hypertrace.framework.grpc.jakarta)
-  api(libs.hypertrace.framework.http.jakarta)
-  api(libs.hypertrace.framework.spi.jakarta)
-  api(libs.hypertrace.integrationtest.framework.jakarta)
-  api(libs.hypertrace.framework.documentstore.metrics.jakarta)
+  // TODO: uncomment after publishing service-framework with Jetty 12
+  // api(libs.hypertrace.framework.grpc.jakarta)
+  // api(libs.hypertrace.framework.http.jakarta)
+  // api(libs.hypertrace.framework.spi.jakarta)
+  // api(libs.hypertrace.integrationtest.framework.jakarta)
+  // api(libs.hypertrace.framework.documentstore.metrics.jakarta)
   api(libs.apache.httpcomponents.httpclient)
   api(libs.awaitility)
   api(libs.jakarta.inject.api)