diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c2874a9..9b6f59c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -4,7 +4,6 @@ on:
   release:
     types:
       - created
-  workflow_dispatch:
 
 jobs:
   publish-artifacts:
diff --git a/build.gradle.kts b/build.gradle.kts
index dc91259..40dc7c6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,11 +22,6 @@ subprojects {
       apply(plugin = rootProject.commonLibs.plugins.hypertrace.codestyle.get().pluginId)
     }
   }
-  pluginManager.withPlugin("java-library") {
-    dependencies {
-      "api"(platform(rootProject.localLibs.jetty.bom))
-    }
-  }
 }
 
 dependencyCheck {
diff --git a/docstore-metrics/gradle.lockfile b/docstore-metrics/gradle.lockfile
index 121f93e..cfe5499 100644
--- a/docstore-metrics/gradle.lockfile
+++ b/docstore-metrics/gradle.lockfile
@@ -40,16 +40,16 @@ org.apache.commons:commons-dbcp2:2.9.0=runtimeClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.18.0=runtimeClasspath,testRuntimeClasspath
 org.apache.commons:commons-pool2:2.10.0=runtimeClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-session:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.33=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.documentstore:document-store:0.8.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
@@ -59,6 +59,6 @@ org.mongodb:mongodb-driver-core:5.2.0=runtimeClasspath,testRuntimeClasspath
 org.mongodb:mongodb-driver-sync:5.2.0=runtimeClasspath,testRuntimeClasspath
 org.postgresql:postgresql:42.5.5=runtimeClasspath,testRuntimeClasspath
 org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
-org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
 empty=
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4836bff..0409e1d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,6 @@ dropwizard-metrics = "4.2.25"
 micrometer = "1.14.4"
 prometheus-simpleclient = "0.16.0"
 caffeine = "3.1.8"
-jetty = "12.0.33"
 
 [libraries]
 awaitility = { module = "org.awaitility:awaitility", version = "4.0.3" }
@@ -19,10 +18,6 @@ prometheus-simpleclient-servlet-jakarta = { module = "io.prometheus:simpleclient
 prometheus-simpleclient-pushgateway = { module = "io.prometheus:simpleclient_pushgateway", version.ref = "prometheus-simpleclient" }
 caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffeine" }
 apache-httpcomponents-httpclient = { module = "org.apache.httpcomponents:httpclient", version = "4.5.13" }
-jetty-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty" }
-jetty-ee10-servlet = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlet", version.ref = "jetty" }
-jetty-ee10-servlets = { module = "org.eclipse.jetty.ee10:jetty-ee10-servlets", version.ref = "jetty" }
-jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" }
 
 [plugins]
 hypertrace-java-convention = { id = "org.hypertrace.java-convention", version = "0.4.0" }
diff --git a/integrationtest-service-framework/gradle.lockfile b/integrationtest-service-framework/gradle.lockfile
index 81c2e22..c110aa6 100644
--- a/integrationtest-service-framework/gradle.lockfile
+++ b/integrationtest-service-framework/gradle.lockfile
@@ -42,19 +42,19 @@ org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspat
 org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
 org.awaitility:awaitility:4.0.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-session:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.33=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
 empty=annotationProcessor
diff --git a/platform-grpc-service-framework/gradle.lockfile b/platform-grpc-service-framework/gradle.lockfile
index ea337be..7d27cb6 100644
--- a/platform-grpc-service-framework/gradle.lockfile
+++ b/platform-grpc-service-framework/gradle.lockfile
@@ -73,22 +73,22 @@ org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspat
 org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-session:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.33=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.22=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-utils:0.13.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
 org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
-org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
 empty=
diff --git a/platform-http-service-framework/build.gradle.kts b/platform-http-service-framework/build.gradle.kts
index d31cbee..e0a695d 100644
--- a/platform-http-service-framework/build.gradle.kts
+++ b/platform-http-service-framework/build.gradle.kts
@@ -15,9 +15,9 @@ dependencies {
   implementation(commonLibs.slf4j2.api)
   implementation(commonLibs.guice.servlet)
   implementation(commonLibs.guava)
-  implementation(localLibs.jetty.ee10.servlet)
-  implementation(localLibs.jetty.server)
-  implementation(localLibs.jetty.ee10.servlets)
+  implementation(commonLibs.jetty.servlet)
+  implementation(commonLibs.jetty.server)
+  implementation(commonLibs.jetty.servlets)
   annotationProcessor(commonLibs.lombok)
   compileOnly(commonLibs.lombok)
 }
diff --git a/platform-http-service-framework/gradle.lockfile b/platform-http-service-framework/gradle.lockfile
index 955c97e..8577519 100644
--- a/platform-http-service-framework/gradle.lockfile
+++ b/platform-http-service-framework/gradle.lockfile
@@ -61,21 +61,21 @@ org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.33.0=compileClasspath,testCompileClasspath
 org.checkerframework:checker-qual:3.43.0=runtimeClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.24=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-session:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlets:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.22=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
 org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
-org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=
diff --git a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/jetty/JettyHttpServerBuilder.java b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/jetty/JettyHttpServerBuilder.java
index 77086d8..9bc4293 100644
--- a/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/jetty/JettyHttpServerBuilder.java
+++ b/platform-http-service-framework/src/main/java/org/hypertrace/core/serviceframework/http/jetty/JettyHttpServerBuilder.java
@@ -17,11 +17,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import javax.annotation.Nullable;
-import org.eclipse.jetty.ee10.servlet.ErrorPageErrorHandler;
-import org.eclipse.jetty.ee10.servlet.FilterHolder;
-import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
-import org.eclipse.jetty.ee10.servlet.ServletHolder;
-import org.eclipse.jetty.ee10.servlets.CrossOriginFilter;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
@@ -29,6 +24,12 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.handler.ErrorHandler;
+import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
+import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.hypertrace.core.serviceframework.http.HttpContainer;
 import org.hypertrace.core.serviceframework.http.HttpHandlerDefinition;
 import org.hypertrace.core.serviceframework.http.HttpHandlerDefinition.CorsConfig;
@@ -104,7 +105,7 @@ private Handler buildHandler(HttpHandlerDefinition handlerDefinition) {
             ? ServletContextHandler.SESSIONS
             : ServletContextHandler.NO_SESSIONS;
     ServletContextHandler context = new ServletContextHandler(options);
-    ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();
+    ErrorHandler errorHandler = new ErrorPageErrorHandler();
     errorHandler.setShowServlet(false);
     errorHandler.setShowStacks(false);
     context.setErrorHandler(errorHandler);
@@ -127,7 +128,7 @@ private Handler buildHandler(HttpHandlerDefinition handlerDefinition) {
     this.buildServletHolderIfRequired(handlerDefinition)
         .ifPresent(
             servletHolder -> context.addServlet(servletHolder, handlerDefinition.getContextPath()));
-    context.setVirtualHosts(List.of("@" + handlerDefinition.getName()));
+    context.setVirtualHosts(new String[] {"@" + handlerDefinition.getName()});
     return context;
   }
 
diff --git a/platform-hybrid-service-framework/gradle.lockfile b/platform-hybrid-service-framework/gradle.lockfile
index b9dce7c..15fcf59 100644
--- a/platform-hybrid-service-framework/gradle.lockfile
+++ b/platform-hybrid-service-framework/gradle.lockfile
@@ -79,23 +79,23 @@ org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspat
 org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
 org.checkerframework:checker-qual:3.43.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlets:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-session:12.0.33=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.33=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlets:11.0.26=runtimeClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.26=runtimeClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-client-utils:0.13.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-context-utils:0.13.22=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.grpcutils:grpc-server-utils:0.13.22=runtimeClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
 org.projectlombok:lombok:1.18.30=annotationProcessor,compileClasspath
-org.slf4j:slf4j-api:2.0.17=runtimeClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.13=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.7=compileClasspath,testCompileClasspath
 empty=
diff --git a/platform-metrics/build.gradle.kts b/platform-metrics/build.gradle.kts
index ef66505..1c61f2b 100644
--- a/platform-metrics/build.gradle.kts
+++ b/platform-metrics/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
   implementation(localLibs.prometheus.simpleclient.dropwizard)
   implementation(localLibs.prometheus.simpleclient.servlet.jakarta)
   implementation(localLibs.prometheus.simpleclient.pushgateway)
-  implementation(localLibs.jetty.ee10.servlet)
+  implementation(commonLibs.jetty.servlet)
   implementation(commonLibs.guava)
 
   compileOnly(localLibs.caffeine)
diff --git a/platform-metrics/gradle.lockfile b/platform-metrics/gradle.lockfile
index 8369943..000b5d1 100644
--- a/platform-metrics/gradle.lockfile
+++ b/platform-metrics/gradle.lockfile
@@ -40,16 +40,16 @@ org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=runtimeClasspath
 org.checkerframework:checker-qual:3.37.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-session:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.10.0=testRuntimeClasspath
@@ -62,5 +62,6 @@ org.latencyutils:LatencyUtils:2.0.3=runtimeClasspath,testRuntimeClasspath
 org.mockito:mockito-core:5.8.0=testCompileClasspath,testRuntimeClasspath
 org.objenesis:objenesis:3.3=testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath,testCompileClasspath
+org.slf4j:slf4j-api:2.0.17=testRuntimeClasspath
 empty=annotationProcessor
diff --git a/platform-service-framework/build.gradle.kts b/platform-service-framework/build.gradle.kts
index 40b2bd4..400ae11 100644
--- a/platform-service-framework/build.gradle.kts
+++ b/platform-service-framework/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
 
   // Use for thread dump servlet
   implementation(localLibs.dropwizard.metrics.jakarta.servlets)
-  implementation(localLibs.jetty.ee10.servlet)
+  implementation(commonLibs.jetty.servlet)
 
   // Use for metrics servlet
   implementation(localLibs.prometheus.simpleclient.servlet.jakarta)
diff --git a/platform-service-framework/gradle.lockfile b/platform-service-framework/gradle.lockfile
index 04f2229..6701c2b 100644
--- a/platform-service-framework/gradle.lockfile
+++ b/platform-service-framework/gradle.lockfile
@@ -49,16 +49,16 @@ org.apache.logging.log4j:log4j-core:2.25.3=testRuntimeClasspath
 org.apache.logging.log4j:log4j-slf4j2-impl:2.25.3=testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.checkerframework:checker-qual:3.33.0=runtimeClasspath,testRuntimeClasspath
-org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-http:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-security:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-session:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-http:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-io:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-security:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-server:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-servlet:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-util:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hdrhistogram:HdrHistogram:2.2.2=runtimeClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jspecify:jspecify:1.0.0=testCompileClasspath
 org.junit.jupiter:junit-jupiter-api:5.10.0=testCompileClasspath,testRuntimeClasspath
@@ -76,5 +76,6 @@ org.osgi:org.osgi.annotation.bundle:2.0.0=testCompileClasspath
 org.osgi:org.osgi.annotation.versioning:1.1.2=testCompileClasspath
 org.osgi:org.osgi.resource:1.0.0=testCompileClasspath
 org.osgi:org.osgi.service.serviceloader:1.0.0=testCompileClasspath
-org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.slf4j:slf4j-api:2.0.13=compileClasspath,runtimeClasspath
+org.slf4j:slf4j-api:2.0.17=testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor
diff --git a/platform-service-framework/src/main/java/org/hypertrace/core/serviceframework/PlatformService.java b/platform-service-framework/src/main/java/org/hypertrace/core/serviceframework/PlatformService.java
index d3937ff..c5ef331 100644
--- a/platform-service-framework/src/main/java/org/hypertrace/core/serviceframework/PlatformService.java
+++ b/platform-service-framework/src/main/java/org/hypertrace/core/serviceframework/PlatformService.java
@@ -8,9 +8,9 @@
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.UnknownHostException;
-import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
-import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 import org.hypertrace.core.serviceframework.config.ConfigClient;
 import org.hypertrace.core.serviceframework.config.ConfigClientFactory;
 import org.hypertrace.core.serviceframework.metrics.PlatformMetricsRegistry;
diff --git a/platform-service-framework/src/test/java/org/hypertrace/core/serviceframework/service/servlets/JVMDiagnosticServletTest.java b/platform-service-framework/src/test/java/org/hypertrace/core/serviceframework/service/servlets/JVMDiagnosticServletTest.java
index d5d4f01..eae4744 100644
--- a/platform-service-framework/src/test/java/org/hypertrace/core/serviceframework/service/servlets/JVMDiagnosticServletTest.java
+++ b/platform-service-framework/src/test/java/org/hypertrace/core/serviceframework/service/servlets/JVMDiagnosticServletTest.java
@@ -1,11 +1,11 @@
 package org.hypertrace.core.serviceframework.service.servlets;
 
-import org.eclipse.jetty.ee10.servlet.ServletTester;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.http.HttpTester;
 import org.eclipse.jetty.http.HttpTester.Request;
 import org.eclipse.jetty.http.HttpTester.Response;
 import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.servlet.ServletTester;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
diff --git a/service-framework-spi/gradle.lockfile b/service-framework-spi/gradle.lockfile
index ac4e579..eeb68d5 100644
--- a/service-framework-spi/gradle.lockfile
+++ b/service-framework-spi/gradle.lockfile
@@ -4,7 +4,7 @@
 com.fasterxml.jackson:jackson-bom:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.grpc:grpc-bom:1.75.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 io.netty:netty-bom:4.1.132.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-bom:12.0.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hypertrace.bom:hypertrace-bom:0.3.76=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jetty:jetty-bom:11.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.hypertrace.bom:hypertrace-bom:0.3.75=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hypertrace.core.kafkastreams.framework:kafka-bom:0.6.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor