diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.20.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.20.target
index 769d17e5..958fb7ed 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.20.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-e4.20.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="tracecompass-incubator-e4.20" sequenceNumber="6">
+<target name="tracecompass-incubator-e4.20" sequenceNumber="7">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -42,10 +42,8 @@
 <unit id="javax.ws.rs" version="0.0.0"/>
 <unit id="javax.activation" version="1.1.0.v201211130549"/>
 <unit id="javax.annotation" version="1.2.0.v201602091430"/>
-<unit id="javax.servlet" version="0.0.0"/>
 <unit id="javax.xml.bind" version="0.0.0"/>
 <unit id="javax.xml.stream" version="0.0.0"/>
-<unit id="javax.servlet.jsp" version="0.0.0"/>
 <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
 <unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/>
 <unit id="org.apache.commons.cli" version="0.0.0"/>
@@ -223,6 +221,16 @@
 			</dependency>
 		</dependencies>
 	</location>
+	<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
+		<dependencies>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>javax.servlet-api</artifactId>
+				<version>4.0.1</version>
+				<type>jar</type>
+			</dependency>
+		</dependencies>
+	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <launcherArgs>
@@ -230,4 +238,4 @@
 -Xmx512M</vmArgs>
 <programArgs>-consolelog</programArgs>
 </launcherArgs>
-</target>
+</target>
\ No newline at end of file
diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
index 974d883f..752a4216 100644
--- a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-master.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="tracecompass-incubator-master" sequenceNumber="70">
+<target name="tracecompass-incubator-master" sequenceNumber="71">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
@@ -45,8 +45,8 @@
 <unit id="org.glassfish.hk2.utils.source" version="0.0.0"/>
 <unit id="org.glassfish.jersey.inject.jersey-hk2" version="0.0.0"/>
 <unit id="org.glassfish.jersey.inject.jersey-hk2.source" version="0.0.0"/>
-<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3.v20200509-0149"/>
-<unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.3.v20200509-0149"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="1.0.3.v20221203-1659"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator.source" version="1.0.3.v20221203-1659"/>
 <unit id="org.glassfish.jersey.core.jersey-client" version="0.0.0"/>
 <unit id="org.glassfish.jersey.core.jersey-client.source" version="0.0.0"/>
 <unit id="org.glassfish.jersey.core.jersey-common" version="0.0.0"/>
@@ -61,9 +61,6 @@
 <unit id="org.glassfish.jersey.containers.servlet.core.source" version="0.0.0"/>
 <unit id="org.glassfish.jersey.ext.entityfiltering" version="0.0.0"/>
 <unit id="org.glassfish.jersey.ext.entityfiltering.source" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
 <unit id="jakarta.xml.bind" version="2.3.3.v20221203-1659"/>
 <unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
@@ -76,20 +73,10 @@
 <unit id="org.mozilla.javascript" version="1.7.10.v20221112-0806"/>
 <unit id="org.slf4j.api" version="0.0.0"/>
 <unit id="org.slf4j.binding.simple" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="javassist" version="0.0.0"/>
-<unit id="javax.activation" version="1.1.0.v201211130549"/>
-<unit id="javax.annotation" version="1.2.0.v201602091430"/>
-<unit id="javax.servlet" version="0.0.0"/>
-<unit id="javax.xml.bind" version="0.0.0"/>
-<unit id="javax.xml.stream" version="0.0.0"/>
-<unit id="javax.servlet.jsp" version="0.0.0"/>
+<unit id="javax.activation" version="1.2.2.v20221203-1659"/>
+<unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
 <unit id="org.apache.commons.lang3" version="0.0.0"/>
-<unit id="org.apache.derby" version="0.0.0"/>
-<unit id="org.json" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -226,6 +213,26 @@
 			</dependency>
 		</dependencies>
 	</location>
+	<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
+		<dependencies>
+			<dependency>
+				<groupId>javax.servlet</groupId>
+				<artifactId>javax.servlet-api</artifactId>
+				<version>4.0.1</version>
+				<type>jar</type>
+			</dependency>
+		</dependencies>
+	</location>
+	<location includeDependencyDepth="infinite" includeDependencyScopes="provided,compile,system,runtime" includeSource="true" missingManifest="generate" type="Maven">
+		<dependencies>
+			<dependency>
+				<groupId>org.javassist</groupId>
+				<artifactId>javassist</artifactId>
+				<version>3.29.2-GA</version>
+				<type>jar</type>
+			</dependency>
+		</dependencies>
+	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <launcherArgs>
diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml b/rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml
index 9d7cf076..67574d73 100644
--- a/rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.incubator.rcp/feature.xml
@@ -49,6 +49,13 @@
       <import feature="org.eclipse.platform" version="0.0.0" match="greaterOrEqual"/>
    </requires>
 
+   <plugin
+         id="jakarta.activation-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="javax.ws.rs"
          download-size="0"
diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml b/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
index 39c11932..e67edbf0 100644
--- a/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
+++ b/rcp/org.eclipse.tracecompass.incubator.rcp/pom.xml
@@ -38,6 +38,7 @@
             </goals>
             <configuration>
               <excludes>
+                <plugin id="jakarta.activation-api"/>
                 <plugin id="javax.ws.rs"/>
                 <plugin id="org.eclipse.lsp4j"/>
                 <plugin id="org.eclipse.lsp4j.jsonrpc"/>
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
index aa3d9bbb..f8ba24d5 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.jersey.rest.core/META-INF/MANIFEST.MF
@@ -10,11 +10,11 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.jetty.http;bundle-version="9.4.5",
- org.eclipse.jetty.server;bundle-version="9.4.5",
- org.eclipse.jetty.servlet;bundle-version="9.4.5",
- org.eclipse.jetty.util;bundle-version="9.4.5",
- javax.servlet;bundle-version="3.1.0",
+ org.eclipse.jetty.http,
+ org.eclipse.jetty.server,
+ org.eclipse.jetty.servlet,
+ org.eclipse.jetty.util,
+ javax.servlet-api,
  javax.ws.rs,
  org.eclipse.tracecompass.common.core,
  org.eclipse.tracecompass.tmf.core,
@@ -29,7 +29,6 @@ Require-Bundle: org.eclipse.core.runtime,
  org.glassfish.hk2.api,
  org.glassfish.jersey.containers.servlet.core,
  org.aopalliance,
- javax.servlet.jsp,
  com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider,
  com.fasterxml.jackson.core.jackson-annotations,
  com.fasterxml.jackson.core.jackson-core,
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product
index 42c89321..c9c0f3a5 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/legacy/traceserver.product
@@ -121,8 +121,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="javax.annotation"/>
       <plugin id="javax.el"/>
       <plugin id="javax.inject"/>
-      <plugin id="javax.servlet"/>
-      <plugin id="javax.servlet.jsp"/>
+      <plugin id="javax.servlet-api"/>
       <plugin id="javax.ws.rs"/>
       <plugin id="javax.xml"/>
       <plugin id="javax.xml.bind"/>
diff --git a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
index 18fdb046..9f2683d8 100644
--- a/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
+++ b/trace-server/org.eclipse.tracecompass.incubator.trace.server.product/traceserver.product
@@ -121,11 +121,9 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="javax.annotation"/>
       <plugin id="javax.el-api"/>
       <plugin id="javax.inject"/>
-      <plugin id="javax.servlet"/>
-      <plugin id="javax.servlet.jsp"/>
+      <plugin id="javax.servlet-api"/>
       <plugin id="javax.ws.rs"/>
       <plugin id="javax.xml"/>
-      <plugin id="javax.xml.bind"/>
       <plugin id="javax.xml.stream"/>
       <plugin id="org.antlr.runtime"/>
       <plugin id="org.aopalliance"/>