diff --git a/Jenkinsfile b/Jenkinsfile
index e93750212e4..e3facd83dc7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -233,7 +233,7 @@ pipeline {
             cambpmConditionalRetry([
               agentLabel: 'postgresql_142',
               runSteps: {
-                cambpmRunMaven('qa/', 'clean install -Ptomcat,postgresql,engine-integration', runtimeStash: true, archiveStash: true)
+                cambpmRunMaven('qa/', 'clean install -Ptomcat9,postgresql,engine-integration', runtimeStash: true, archiveStash: true)
               },
               postFailure: {
                 cambpmPublishTestResult()
@@ -241,6 +241,25 @@ pipeline {
             ])
           }
         }
+        stage('engine-IT-tomcat-10-postgresql-142') {
+          when {
+            expression {
+              cambpmWithLabels('all-as', 'tomcat')
+            }
+          }
+          steps {
+            cambpmConditionalRetry([
+              agentLabel: 'postgresql_142',
+              runSteps: {
+                cambpmRunMaven('qa/', 'clean install -Ptomcat,postgresql,engine-integration-jakarta', runtimeStash: true, archiveStash: true, jdkVersion: 'jdk-17-latest')
+              },
+              postFailure: {
+                cambpmPublishTestResult()
+                cambpmArchiveArtifacts('qa/tomcat-runtime/target/**/standalone/log/**')
+              }
+            ])
+          }
+        }
         stage('engine-IT-wildfly-postgresql-142') {
           when {
             expression {
@@ -339,11 +358,31 @@ pipeline {
             cambpmConditionalRetry([
               agentLabel: 'chrome_112',
               runSteps: {
-                cambpmRunMaven('qa/', 'clean install -Ptomcat,h2,webapps-integration', runtimeStash: true, archiveStash: true)
+                cambpmRunMaven('qa/', 'clean install -Ptomcat9,h2,webapps-integration', runtimeStash: true, archiveStash: true)
+              },
+              postFailure: {
+                cambpmPublishTestResult()
+                cambpmArchiveArtifacts('qa/integration-tests-webapps/shared-engine/target/selenium-screenshots/*')
+              }
+            ])
+          }
+        }
+        stage('webapp-IT-tomcat-10-h2') {
+          when {
+            expression {
+              cambpmWithLabels('webapp-integration', 'h2')
+            }
+          }
+          steps {
+            cambpmConditionalRetry([
+              agentLabel: 'chrome_112',
+              runSteps: {
+                cambpmRunMaven('qa/', 'clean install -Ptomcat,h2,webapps-integration -DskipTests-webapps=true', runtimeStash: true, archiveStash: true, jdkVersion: 'jdk-17-latest')
               },
               postFailure: {
                 cambpmPublishTestResult()
                 cambpmArchiveArtifacts('qa/integration-tests-webapps/shared-engine/target/selenium-screenshots/*')
+                cambpmArchiveArtifacts('qa/integration-tests-webapps/shared-engine/target/*')
               }
             ])
           }
diff --git a/clients/java/client/pom.xml b/clients/java/client/pom.xml
index 2defee0ed3d..c3f003a02a3 100644
--- a/clients/java/client/pom.xml
+++ b/clients/java/client/pom.xml
@@ -137,7 +137,7 @@
 
     <dependency>
       <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-rest</artifactId>
+      <artifactId>camunda-engine-rest-jakarta</artifactId>
       <scope>test</scope>
       <type>war</type>
       <classifier>tomcat</classifier>
@@ -262,7 +262,7 @@
           <!-- Container configuration -->
           <container>
             <type>installed</type>
-            <containerId>tomcat9x</containerId>
+            <containerId>tomcat10x</containerId>
             <append>false</append>
             <home>${tomcat.runtime}</home>
             <timeout>${cargo.timeout}</timeout>
@@ -288,7 +288,7 @@
           <deployables>
             <deployable>
               <groupId>org.camunda.bpm</groupId>
-              <artifactId>camunda-engine-rest</artifactId>
+              <artifactId>camunda-engine-rest-jakarta</artifactId>
               <type>war</type>
               <classifier>tomcat</classifier>
               <pingURL>
diff --git a/clients/java/qa/engine-variable-test/pom.xml b/clients/java/qa/engine-variable-test/pom.xml
index 1727cc6b950..6ac6ee7b887 100644
--- a/clients/java/qa/engine-variable-test/pom.xml
+++ b/clients/java/qa/engine-variable-test/pom.xml
@@ -22,9 +22,9 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>4.0.0</version>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/clients/java/qa/engine-variable-test/src/main/java/org/camunda/qa/Application.java b/clients/java/qa/engine-variable-test/src/main/java/org/camunda/qa/Application.java
index d8d0578b930..2a5dfbf91a0 100644
--- a/clients/java/qa/engine-variable-test/src/main/java/org/camunda/qa/Application.java
+++ b/clients/java/qa/engine-variable-test/src/main/java/org/camunda/qa/Application.java
@@ -17,12 +17,12 @@
 package org.camunda.qa;
 
 import org.camunda.bpm.application.ProcessApplication;
-import org.camunda.bpm.application.impl.ServletProcessApplication;
+import org.camunda.bpm.application.impl.JakartaServletProcessApplication;
 
 /**
  * @author Tassilo Weidner
  */
 @ProcessApplication
-public class Application extends ServletProcessApplication {
+public class Application extends JakartaServletProcessApplication {
 
 }
\ No newline at end of file
diff --git a/distro/tomcat/assembly/assembly.xml b/distro/tomcat/assembly/assembly.xml
index 86af8da3f65..c2ecc7da9a8 100644
--- a/distro/tomcat/assembly/assembly.xml
+++ b/distro/tomcat/assembly/assembly.xml
@@ -53,7 +53,6 @@
         <include>org.graalvm.sdk:graal-sdk:jar:*</include>
         <include>com.ibm.icu:icu4j:jar:*</include>
         <include>org.slf4j:slf4j-api:jar:*</include>
-        <include>org.slf4j:slf4j-jdk14:jar:*</include>
 
         <include>org.camunda.bpm:camunda-engine-plugin-*:jar</include>
         <include>org.camunda.spin:camunda-spin-core*:jar</include>
@@ -95,7 +94,6 @@
         <include>org.graalvm.sdk:graal-sdk:jar:*</include>
         <include>com.ibm.icu:icu4j:jar:*</include>
         <include>org.slf4j:slf4j-api:jar:*</include>
-        <include>org.slf4j:slf4j-jdk14:jar:*</include>
 
         <include>org.camunda.bpm:camunda-engine-plugin-*:jar</include>
         <include>org.camunda.spin:camunda-spin-core*:jar</include>
diff --git a/distro/tomcat/assembly/pom.xml b/distro/tomcat/assembly/pom.xml
index da92cc7f4a8..d7e13a1c322 100644
--- a/distro/tomcat/assembly/pom.xml
+++ b/distro/tomcat/assembly/pom.xml
@@ -91,7 +91,7 @@
 
     <dependency>
       <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-cdi</artifactId>
+      <artifactId>camunda-engine-cdi-jakarta</artifactId>
     </dependency>
 
     <dependency>
@@ -108,6 +108,7 @@
     <dependency>
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-engine-plugin-spin</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
@@ -125,21 +126,12 @@
     <dependency>
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-engine-plugin-connect</artifactId>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.connect</groupId>
       <artifactId>camunda-connect-connectors-all</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>org.camunda.connect</groupId>
-          <artifactId>camunda-connect-http-client</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.camunda.connect</groupId>
-          <artifactId>camunda-connect-soap-http-client</artifactId>
-        </exclusion>
-      </exclusions>
       <version>${project.version}</version>
     </dependency>
 
@@ -155,11 +147,6 @@
       <artifactId>camunda-template-engines-freemarker</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-    </dependency>
-
   </dependencies>
 
   <build>
diff --git a/distro/tomcat/distro/assembly.xml b/distro/tomcat/distro/assembly.xml
index a1b0461be7a..1c521331225 100644
--- a/distro/tomcat/distro/assembly.xml
+++ b/distro/tomcat/distro/assembly.xml
@@ -34,7 +34,7 @@
 
     <dependencySet>
         <includes>
-            <include>org.camunda.bpm:camunda-engine-rest:war:*</include>
+            <include>org.camunda.bpm:camunda-engine-rest-jakarta:war:*</include>
         </includes>
         <outputDirectory>server/apache-tomcat-${version.tomcat}/webapps/engine-rest</outputDirectory>
         <unpack>true</unpack>
@@ -42,7 +42,7 @@
 
     <dependencySet>
         <includes>
-            <include>org.camunda.bpm.webapp:camunda-webapp-tomcat:war:*</include>
+            <include>org.camunda.bpm.webapp:camunda-webapp-tomcat-jakarta:war:*</include>
         </includes>
         <outputDirectory>server/apache-tomcat-${version.tomcat}/webapps/camunda</outputDirectory>
         <unpack>true</unpack>
@@ -50,7 +50,7 @@
 
     <dependencySet>
         <includes>
-            <include>org.camunda.bpm.example:camunda-example-invoice:war:*</include>
+            <include>org.camunda.bpm.example:camunda-example-invoice-jakarta:war:*</include>
         </includes>
         <outputDirectory>server/apache-tomcat-${version.tomcat}/webapps/camunda-invoice</outputDirectory>
         <unpack>true</unpack>
diff --git a/distro/tomcat/distro/pom.xml b/distro/tomcat/distro/pom.xml
index 34a9f96a4c2..c4f923f261e 100644
--- a/distro/tomcat/distro/pom.xml
+++ b/distro/tomcat/distro/pom.xml
@@ -14,6 +14,15 @@
 
   <dependencies>
 
+    <dependency>
+      <groupId>org.camunda.bpm.distro</groupId>
+      <artifactId>camunda-sql-scripts</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+
+    <!-- Tomcat 10 dependencies -->
+
     <dependency>
       <groupId>org.camunda.bpm.tomcat</groupId>
       <artifactId>camunda-tomcat-assembly</artifactId>
@@ -22,20 +31,36 @@
     </dependency>
 
     <dependency>
-      <groupId>org.camunda.bpm.distro</groupId>
-      <artifactId>camunda-sql-scripts</artifactId>
+      <groupId>org.camunda.bpm.webapp</groupId>
+      <artifactId>camunda-webapp-tomcat-jakarta</artifactId>
       <version>${project.version}</version>
-      <type>jar</type>
+      <type>war</type>
     </dependency>
 
     <dependency>
       <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-rest</artifactId>
+      <artifactId>camunda-engine-rest-jakarta</artifactId>
       <version>${project.version}</version>
       <classifier>tomcat</classifier>
       <type>war</type>
     </dependency>
 
+    <dependency>
+      <groupId>org.camunda.bpm.example</groupId>
+      <artifactId>camunda-example-invoice-jakarta</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+
+      <!-- Tomcat 9 dependencies -->
+
+    <dependency>
+      <groupId>org.camunda.bpm.tomcat</groupId>
+      <artifactId>camunda-tomcat-assembly</artifactId>
+      <version>${project.version}</version>
+      <type>tar.gz</type>
+    </dependency>
+
     <dependency>
       <groupId>org.camunda.bpm.webapp</groupId>
       <artifactId>camunda-webapp-tomcat</artifactId>
@@ -43,11 +68,20 @@
       <type>war</type>
     </dependency>
 
+    <dependency>
+      <groupId>org.camunda.bpm</groupId>
+      <artifactId>camunda-engine-rest</artifactId>
+      <version>${project.version}</version>
+      <classifier>tomcat</classifier>
+      <type>war</type>
+    </dependency>
+
     <dependency>
       <groupId>org.camunda.bpm.example</groupId>
       <artifactId>camunda-example-invoice</artifactId>
       <version>${project.version}</version>
       <type>war</type>
+
     </dependency>
 
   </dependencies>
@@ -59,7 +93,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
-            <id>distro</id>
+            <id>distro-tomcat10</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
diff --git a/distro/tomcat/pom.xml b/distro/tomcat/pom.xml
index 0b6c0b68b35..a25e7af2053 100644
--- a/distro/tomcat/pom.xml
+++ b/distro/tomcat/pom.xml
@@ -44,6 +44,7 @@
       <modules>
         <module>distro</module>
         <module>webapp</module>
+        <module>webapp-jakarta</module>
       </modules>
     </profile>
   </profiles>
diff --git a/distro/tomcat/webapp-jakarta/pom.xml b/distro/tomcat/webapp-jakarta/pom.xml
new file mode 100644
index 00000000000..0c1ee198887
--- /dev/null
+++ b/distro/tomcat/webapp-jakarta/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.camunda.bpm.tomcat</groupId>
+    <artifactId>camunda-tomcat</artifactId>
+    <version>7.22.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <name>Camunda Platform - webapp - jakarta - Tomcat</name>
+  <groupId>org.camunda.bpm.webapp</groupId>
+  <artifactId>camunda-webapp-tomcat-jakarta</artifactId>
+  <packaging>war</packaging>
+  
+  <properties>
+    <skip-third-party-bom>false</skip-third-party-bom>
+
+    <version.resteasy>6.2.3.Final</version.resteasy>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.camunda.bpm.webapp</groupId>
+      <artifactId>camunda-webapp-jakarta</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-core</artifactId>
+      <version>${version.resteasy}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>camunda-webapp</finalName>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/distro/tomcat/webapp-jakarta/src/main/webapp/WEB-INF/web.xml b/distro/tomcat/webapp-jakarta/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..cfca17a1d10
--- /dev/null
+++ b/distro/tomcat/webapp-jakarta/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app
+  version="3.0"
+  xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+  <display-name>Camunda Platform webapp</display-name>
+
+  <!-- cockpit bootstrap listener -->
+  <listener>
+    <listener-class>org.camunda.bpm.cockpit.impl.web.bootstrap.CockpitContainerBootstrap</listener-class>
+  </listener>
+
+  <!-- admin bootstrap listener -->
+  <listener>
+    <listener-class>org.camunda.bpm.admin.impl.web.bootstrap.AdminContainerBootstrap</listener-class>
+  </listener>
+
+  <!-- tasklist bootstrap listener -->
+  <listener>
+    <listener-class>org.camunda.bpm.tasklist.impl.web.bootstrap.TasklistContainerBootstrap</listener-class>
+  </listener>
+
+  <!-- welcome bootstrap listener -->
+  <listener>
+    <listener-class>org.camunda.bpm.welcome.impl.web.bootstrap.WelcomeContainerBootstrap</listener-class>
+  </listener>
+
+  <!-- http session mutex listener -->
+  <listener>
+    <listener-class>org.camunda.bpm.webapp.impl.security.filter.util.HttpSessionMutexListener</listener-class>
+  </listener>
+
+  <session-config>
+    <cookie-config>
+      <http-only>true</http-only>
+      <secure>false</secure>
+    </cookie-config>
+  </session-config>
+
+  <!-- Container Based Authentication filter -->
+  <!-- <filter>
+    <filter-name>Container Based Authentication Filter</filter-name>
+    <filter-class>org.camunda.bpm.webapp.impl.security.auth.ContainerBasedAuthenticationFilter</filter-class>
+    <init-param>
+      <param-name>authentication-provider</param-name>
+      <param-value>org.camunda.bpm.engine.rest.security.auth.impl.ContainerBasedAuthenticationProvider</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>Container Based Authentication Filter</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+  </filter-mapping> -->
+
+  <!-- Authentication filter -->
+  <filter>
+    <filter-name>Authentication Filter</filter-name>
+    <filter-class>org.camunda.bpm.webapp.impl.security.auth.AuthenticationFilter</filter-class>
+    <!-- See https://docs.camunda.org/manual/latest/webapps/shared-options/authentication/#cache -->
+    <init-param>
+      <param-name>cacheTimeToLive</param-name>
+      <param-value>300000</param-value>
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>Authentication Filter</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+  </filter-mapping>
+
+  <!-- Security filter -->
+  <filter>
+    <filter-name>SecurityFilter</filter-name>
+    <filter-class>org.camunda.bpm.webapp.impl.security.filter.SecurityFilter</filter-class>
+    <init-param>
+      <param-name>configFile</param-name>
+      <param-value>/WEB-INF/securityFilterRules.json</param-value>  
+    </init-param>
+  </filter>
+  <filter-mapping>
+    <filter-name>SecurityFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+  </filter-mapping>
+
+  <!-- CSRF Prevention filter -->
+  <filter>
+    <filter-name>CsrfPreventionFilter</filter-name>
+    <filter-class>org.camunda.bpm.webapp.impl.security.filter.CsrfPreventionFilter</filter-class>
+    <!--<init-param>-->
+    <!--<param-name>targetOrigin</param-name>-->
+    <!--<param-value>http://localhost:8080</param-value>-->
+    <!--</init-param>-->
+  </filter>
+  <filter-mapping>
+    <filter-name>CsrfPreventionFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <!-- Session Cookie filter -->
+  <filter>
+    <filter-name>SessionCookieFilter</filter-name>
+    <filter-class>org.camunda.bpm.webapp.impl.security.filter.SessionCookieFilter</filter-class>
+    <!--<init-param>-->
+    <!--<param-name>enableSecureCookie</param-name>-->
+    <!--<param-value>true</param-value>-->
+    <!--</init-param>-->
+  </filter>
+  <filter-mapping>
+    <filter-name>SessionCookieFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <!-- HTTP Header Security Filter -->
+  <filter>
+    <filter-name>HttpHeaderSecurity</filter-name>
+    <filter-class>org.camunda.bpm.webapp.impl.security.filter.headersec.HttpHeaderSecurityFilter</filter-class>
+
+    <!--
+    The Strict Transport Security header is disabled by default.
+    You can enable it by uncommenting the configuration below.
+    Read more about it in the documentation
+    https://docs.camunda.org/manual/latest/webapps/shared-options/header-security/#strict-transport-security
+    -->
+
+    <!--
+    <init-param>
+      <param-name>hstsDisabled</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    -->
+  </filter>
+
+  <filter-mapping>
+    <filter-name>HttpHeaderSecurity</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+  </filter-mapping>
+
+  <!-- Empty body filter -->
+  <filter>
+    <filter-name>EmptyBodyFilter</filter-name>
+    <filter-class>org.camunda.bpm.engine.rest.filter.EmptyBodyFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>EmptyBodyFilter</filter-name>
+    <url-pattern>/api/*</url-pattern>
+  </filter-mapping>
+
+  <!-- REST cache control filter -->
+  <filter>
+    <filter-name>CacheControlFilter</filter-name>
+    <filter-class>org.camunda.bpm.engine.rest.filter.CacheControlFilter</filter-class>    
+  </filter>
+  <filter-mapping>
+    <filter-name>CacheControlFilter</filter-name>
+    <url-pattern>/api/*</url-pattern>
+  </filter-mapping>
+
+  <!-- engines filter -->
+  <filter>
+    <filter-name>Engines Filter</filter-name>
+    <filter-class>org.camunda.bpm.webapp.impl.engine.ProcessEnginesFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>Engines Filter</filter-name>
+    <url-pattern>/app/*</url-pattern>
+    <dispatcher>REQUEST</dispatcher>
+  </filter-mapping>
+
+  <!-- cockpit rest api -->
+  <servlet>
+    <servlet-name>Cockpit Api</servlet-name>
+    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+    <init-param>
+      <param-name>jakarta.ws.rs.Application</param-name>
+      <param-value>org.camunda.bpm.cockpit.impl.web.CockpitApplication</param-value>
+    </init-param>
+    <init-param>
+      <param-name>resteasy.servlet.mapping.prefix</param-name>
+      <param-value>/api/cockpit</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Cockpit Api</servlet-name>
+    <url-pattern>/api/cockpit/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- admin rest api -->
+  <servlet>
+    <servlet-name>Admin Api</servlet-name>
+    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+    <init-param>
+      <param-name>jakarta.ws.rs.Application</param-name>
+      <param-value>org.camunda.bpm.admin.impl.web.AdminApplication</param-value>
+    </init-param>
+    <init-param>
+      <param-name>resteasy.servlet.mapping.prefix</param-name>
+      <param-value>/api/admin</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Admin Api</servlet-name>
+    <url-pattern>/api/admin/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- tasklist rest api -->
+  <servlet>
+    <servlet-name>Tasklist Api</servlet-name>
+    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+    <init-param>
+      <param-name>jakarta.ws.rs.Application</param-name>
+      <param-value>org.camunda.bpm.tasklist.impl.web.TasklistApplication</param-value>
+    </init-param>
+    <init-param>
+      <param-name>resteasy.servlet.mapping.prefix</param-name>
+      <param-value>/api/tasklist</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Tasklist Api</servlet-name>
+    <url-pattern>/api/tasklist/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- engine rest api (embedded) -->
+  <servlet>
+    <servlet-name>Engine Api</servlet-name>
+    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+    <init-param>
+      <param-name>jakarta.ws.rs.Application</param-name>
+      <param-value>org.camunda.bpm.webapp.impl.engine.EngineRestApplication</param-value>
+    </init-param>
+    <init-param>
+      <param-name>resteasy.servlet.mapping.prefix</param-name>
+      <param-value>/api/engine</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Engine Api</servlet-name>
+    <url-pattern>/api/engine/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- welcome rest api -->
+  <servlet>
+    <servlet-name>Welcome Api</servlet-name>
+    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+    <init-param>
+      <param-name>jakarta.ws.rs.Application</param-name>
+      <param-value>org.camunda.bpm.welcome.impl.web.WelcomeApplication</param-value>
+    </init-param>
+    <init-param>
+      <param-name>resteasy.servlet.mapping.prefix</param-name>
+      <param-value>/api/welcome</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Welcome Api</servlet-name>
+    <url-pattern>/api/welcome/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- default error page -->
+  <error-page>
+    <!-- Missing resource -->
+    <error-code>404</error-code>
+    <location>/error-404-page.html</location>
+  </error-page>
+  <error-page>
+    <!-- Uncaught exception -->
+    <error-code>500</error-code>
+    <location>/error-500-page.html</location>
+  </error-page>
+</web-app>
diff --git a/engine-rest/assembly-jakarta/assembly-war-tomcat.xml b/engine-rest/assembly-jakarta/assembly-war-tomcat.xml
new file mode 100644
index 00000000000..046e9dea3ac
--- /dev/null
+++ b/engine-rest/assembly-jakarta/assembly-war-tomcat.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xmlns="urn:maven:assembly:1.1.2">
+
+  <id>tomcat</id>
+
+  <formats>
+    <format>war</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <dependencySets>
+
+    <!-- Copy the engine-rest-core-jakarta along with its transitive dependencies (compile)  -->
+    <dependencySet>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <includes>
+        <include>org.camunda.bpm:camunda-engine-rest-core-jakarta:jar</include>
+      </includes>
+    </dependencySet>
+
+    <!-- Copy the provided dependencies -->
+    <dependencySet>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <scope>provided</scope>
+      <includes>
+
+        <!-- Jakarta APIs -->
+        <include>jakarta.servlet:jakarta.servlet-api:jar</include>
+        <include>jakarta.activation:jakarta.activation-api:jar</include>
+        <include>jakarta.ws.rs:jakarta.ws.rs-api:jar</include>
+        <include>jakarta.xml.bind:jakarta.xml.bind-api:jar</include>
+
+        <!-- Resteasy -->
+        <include>org.jboss.resteasy:resteasy-*</include>
+
+      </includes>
+      <excludes>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core-jakarta:jar:tests</exclude>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core-jakarta:jar:sources</exclude>
+      </excludes>
+
+    </dependencySet>
+
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>org.camunda.bpm:camunda-engine-rest-jakarta:war:*</include>
+      </includes>
+      <unpack>true</unpack>
+      <unpackOptions>
+        <excludes>
+          <exclude>**/web.xml</exclude>
+        </excludes>
+      </unpackOptions>
+    </dependencySet>
+  </dependencySets>
+
+  <!-- Adds the web.xml that triggers the rest listeners for tomcat -->
+  <fileSets>
+    <fileSet>
+      <directory>src/main/runtime/tomcat/webapp</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+
+</assembly>
\ No newline at end of file
diff --git a/engine-rest/assembly-jakarta/pom.xml b/engine-rest/assembly-jakarta/pom.xml
index 72721b98f33..020dabdd60f 100644
--- a/engine-rest/assembly-jakarta/pom.xml
+++ b/engine-rest/assembly-jakarta/pom.xml
@@ -18,6 +18,8 @@
     runtime-specific-WARs are in provided scope -->
     <skip-third-party-bom>false</skip-third-party-bom>
     <third-party-bom-scopes>compile|provided</third-party-bom-scopes>
+
+    <version.resteasy>6.2.3.Final</version.resteasy>
   </properties>
 
   <dependencyManagement>
@@ -29,6 +31,31 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-core</artifactId>
+        <version>${version.resteasy}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-jaxb-provider</artifactId>
+        <version>${version.resteasy}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-client</artifactId>
+        <version>${version.resteasy}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-servlet-initializer</artifactId>
+        <version>${version.resteasy}</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -47,6 +74,7 @@
       <classifier>sources</classifier>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.camunda.bpm</groupId>
       <artifactId>camunda-engine-rest-core-jakarta</artifactId>
@@ -55,11 +83,46 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- Jakarta API -->
+
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
       <artifactId>jakarta.ws.rs-api</artifactId>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Resteasy -->
+
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-jaxb-provider</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-client</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-servlet-initializer</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -92,6 +155,24 @@
             </configuration>
           </execution>
 
+          <execution>
+            <id>tomcat</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>assembly-war-tomcat.xml</descriptor>
+              </descriptors>
+              <finalName>camunda-engine-rest-jakarta-${project.version}</finalName>
+              <attach>true</attach>
+              <classifier>tomcat</classifier>
+              <outputDirectory>target/</outputDirectory>
+              <workDirectory>target/assembly/work</workDirectory>
+            </configuration>
+          </execution>
+
           <execution>
             <id>classes</id>
             <phase>package</phase>
diff --git a/engine-rest/assembly-jakarta/src/main/runtime/tomcat/webapp/WEB-INF/web.xml b/engine-rest/assembly-jakarta/src/main/runtime/tomcat/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000000..b35a796295c
--- /dev/null
+++ b/engine-rest/assembly-jakarta/src/main/runtime/tomcat/webapp/WEB-INF/web.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee    http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+  <!-- Fetch And Lock Handler (long polling): Unique Worker Request (default value: false) -->
+  <!--
+  <context-param>
+    <param-name>fetch-and-lock-unique-worker-request</param-name>
+    <param-value>true</param-value>
+  </context-param>
+  -->
+
+  <!-- rest bootstrap listener -->
+  <listener>
+    <listener-class>org.camunda.bpm.engine.rest.impl.web.bootstrap.RestContainerBootstrap</listener-class>
+  </listener>
+
+  <listener>
+    <listener-class>org.camunda.bpm.engine.rest.impl.FetchAndLockContextListener</listener-class>
+  </listener>
+
+  <filter>
+    <filter-name>EmptyBodyFilter</filter-name>
+    <filter-class>org.camunda.bpm.engine.rest.filter.EmptyBodyFilter</filter-class>
+    <async-supported>true</async-supported>
+  </filter>
+  <filter-mapping>
+    <filter-name>EmptyBodyFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>CacheControlFilter</filter-name>
+    <filter-class>org.camunda.bpm.engine.rest.filter.CacheControlFilter</filter-class>
+    <async-supported>true</async-supported>
+  </filter>
+  <filter-mapping>
+    <filter-name>CacheControlFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <!-- Http Basic Authentication Filter -->
+  <!-- <filter>
+    <filter-name>camunda-auth</filter-name>
+    <filter-class>
+      org.camunda.bpm.engine.rest.security.auth.ProcessEngineAuthenticationFilter
+    </filter-class>
+	<async-supported>true</async-supported>
+    <init-param>
+      <param-name>authentication-provider</param-name>
+      <param-value>org.camunda.bpm.engine.rest.security.auth.impl.HttpBasicAuthenticationProvider</param-value>
+    </init-param>
+    <init-param>
+	    <param-name>rest-url-pattern-prefix</param-name>
+	    <param-value></param-value>
+	  </init-param>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>camunda-auth</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping> -->
+
+  <servlet>
+    <servlet-name>Resteasy</servlet-name>
+    <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+    <init-param>
+      <param-name>jakarta.ws.rs.Application</param-name>
+      <param-value>org.camunda.bpm.engine.rest.impl.application.DefaultApplication</param-value>
+    </init-param>
+    <async-supported>true</async-supported>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>Resteasy</servlet-name>
+    <url-pattern>/*</url-pattern>
+  </servlet-mapping>
+
+</web-app>
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index ed108aeb8b2..0e5c04edc02 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -63,7 +63,8 @@
     <version.wildfly26>26.0.1.Final</version.wildfly26>
     <version.wildfly26.core>18.0.4.Final</version.wildfly26.core>
 
-    <version.tomcat>9.0.85</version.tomcat>
+    <version.tomcat9>9.0.85</version.tomcat9>
+    <version.tomcat>10.1.18</version.tomcat>
 
     <version.arquillian>1.1.10.Final</version.arquillian>
     <version.shrinkwrap.resolvers>2.2.2</version.shrinkwrap.resolvers>
diff --git a/qa/integration-tests-engine-jakarta/pom.xml b/qa/integration-tests-engine-jakarta/pom.xml
index 76eb2ca48a7..092fe2124c0 100644
--- a/qa/integration-tests-engine-jakarta/pom.xml
+++ b/qa/integration-tests-engine-jakarta/pom.xml
@@ -20,6 +20,8 @@
     <version.arquillian>1.7.0.Final</version.arquillian>
 
     <redirect.test.output>true</redirect.test.output>
+
+    <weld.version>5.1.0.Final</weld.version>
   </properties>
 
   <!-- import shrinkwrap and arquillian bom for artifact versions,
@@ -66,6 +68,13 @@
         <type>pom</type>
       </dependency>
 
+      <!-- Deployed programmatically by DeploymentHelper -->
+      <dependency>
+        <groupId>org.jboss.weld.servlet</groupId>
+        <artifactId>weld-servlet-shaded</artifactId>
+        <version>${weld.version}</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -149,6 +158,8 @@
       <scope>test</scope>
     </dependency>
 
+    <!-- CDI engine & Client -->
+
     <dependency>
       <groupId>org.camunda.bpm.javaee</groupId>
       <artifactId>camunda-ejb-client-jakarta</artifactId>
@@ -336,6 +347,22 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-test-sources-tomcat</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/generated-test-sources/java-tomcat</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/../integration-tests-engine/src/test/java-tomcat</directory>
+                  <filtering>false</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-test-sources-wildfly</id>
             <phase>process-sources</phase>
@@ -387,6 +414,33 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+            <id>copy-test-resources-tomcat</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/generated-test-resources/resources-tomcat</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/../integration-tests-engine/src/test/resources-tomcat</directory>
+                  <filtering>false</filtering>
+                  <!-- Do not copy the tomcat 9 arquillian xml -->
+                  <excludes>
+                    <exclude>**/arquillian.xml</exclude>
+                  </excludes>
+                </resource>
+
+                <!-- Use the tomcat 10 arquillian.xml instead -->
+                <resource>
+                  <directory>${basedir}/src/test/resources-tomcat</directory>
+                  <filtering>false</filtering>
+                </resource>
+
+              </resources>
+            </configuration>
+          </execution>
           <execution>
             <id>copy-test-resources-wildfly</id>
             <phase>process-sources</phase>
@@ -424,6 +478,7 @@
         <groupId>org.eclipse.transformer</groupId>
         <artifactId>transformer-maven-plugin</artifactId>
         <executions>
+          <!-- transform sources -->
           <execution>
             <id>transform-jakarta-test-sources</id>
             <phase>generate-test-sources</phase>
@@ -434,6 +489,16 @@
               <transformDirectory>${project.build.directory}/generated-test-sources/jakarta</transformDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>transform-jakarta-test-sources-tomcat</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>transform</goal>
+            </goals>
+            <configuration>
+              <transformDirectory>${project.build.directory}/generated-test-sources/java-tomcat</transformDirectory>
+            </configuration>
+          </execution>
           <execution>
             <id>transform-jakarta-test-sources-wildfly</id>
             <phase>generate-test-sources</phase>
@@ -454,6 +519,7 @@
               <transformDirectory>${project.build.directory}/generated-test-sources/java-wildfly-servlet</transformDirectory>
             </configuration>
           </execution>
+         <!-- transform resources -->
           <execution>
             <id>transform-jakarta-test-resources</id>
             <phase>generate-test-resources</phase>
@@ -474,6 +540,16 @@
               <transformDirectory>${project.build.directory}/generated-test-resources/resources-wildfly</transformDirectory>
             </configuration>
           </execution>
+          <execution>
+            <id>transform-jakarta-test-resources-tomcat</id>
+            <phase>generate-test-resources</phase>
+            <goals>
+              <goal>transform</goal>
+            </goals>
+            <configuration>
+              <transformDirectory>${project.build.directory}/generated-test-resources/resources-tomcat</transformDirectory>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -513,6 +589,154 @@
 
   <profiles>
 
+    <profile>
+      <id>tomcat</id>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>org.camunda.bpm</groupId>
+            <artifactId>camunda-core-internal-dependencies</artifactId>
+            <version>${project.version}</version>
+            <scope>import</scope>
+            <type>pom</type>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+
+      <dependencies>
+        <dependency>
+          <!-- make sure this comes after runtime in the reactor build -->
+          <groupId>org.camunda.bpm.qa</groupId>
+          <artifactId>camunda-qa-tomcat-runtime</artifactId>
+          <version>${project.version}</version>
+          <scope>provided</scope>
+          <type>pom</type>
+        </dependency>
+
+        <dependency>
+          <groupId>org.jboss.weld.servlet</groupId>
+          <artifactId>weld-servlet-shaded</artifactId>
+          <scope>test</scope>
+        </dependency>
+
+        <!-- This dependency can be updated when arquillian releases the managed tomcat 10 artifact -->
+        <dependency>
+          <groupId>org.jboss.arquillian.container</groupId>
+          <artifactId>arquillian-tomcat-managed-8</artifactId>
+          <version>1.1.0.Final</version>
+          <scope>test</scope>
+        </dependency>
+
+        <!-- switch to use Jakarta Servlet 5.0 protocol -->
+        <dependency>
+          <groupId>org.jboss.arquillian.protocol</groupId>
+          <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.jboss.arquillian.junit</groupId>
+          <artifactId>arquillian-junit-container</artifactId>
+          <scope>test</scope>
+        </dependency>
+
+      </dependencies>
+
+      <build>
+        <testResources>
+          <testResource>
+            <directory>src/test/resources-tomcat</directory>
+            <filtering>true</filtering>
+          </testResource>
+          <testResource>
+            <directory>${project.build.directory}/generated-test-resources/resources-tomcat</directory>
+            <filtering>true</filtering>
+          </testResource>
+        </testResources>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>add-test-source</id>
+                <phase>generate-test-sources</phase>
+                <goals>
+                  <goal>add-test-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>${project.build.directory}/generated-test-sources/java-tomcat</source>
+                  </sources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <configuration>
+              <delimiters>
+                <delimiter>${*}</delimiter>
+              </delimiters>
+              <useDefaultDelimiters>false</useDefaultDelimiters>
+            </configuration>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <skipTests>${skipTests-webapps}</skipTests>
+              <excludes>
+                <!-- no EE stuff on tomcat :) -->
+                <exclude>**/ear/**</exclude>
+                <exclude>**/ejb/**</exclude>
+                <exclude>**/jar/**</exclude>
+                <exclude>**/transactions/**</exclude>
+                <exclude>**/jpa/**</exclude>
+                <!-- No EJB RequestContext available -->
+                <exclude>**/JobExecutorRequestContextTest.java</exclude>
+                <!-- Not supported by arquillian tomcat container -->
+                <exclude>**/TestWarDeploymentWithBrokenBpmnXml.java</exclude>
+                <exclude>**/TestDeploymentWithDroolsTaskFails.java</exclude>
+                <exclude>**/TestProcessEnginesXmlFails.java</exclude>
+
+                <exclude>**/TestWarDeploymentWithProcessEnginePlugin.java</exclude>
+
+                <exclude>**/*_JBOSS.java</exclude>
+                <exclude>**/EjbPALifecycleCallbacksTest.java</exclude>
+
+                <exclude>**/PythonPaClassImportTest.java</exclude>
+
+                <exclude>**/MigrationContextSwitchBeansTest.java</exclude>
+
+                <exclude>**/ManagedJobExecutorTest.java</exclude>
+
+                <!-- TODO Please delete the following exclusion after the Tomcat 10 issue with Arquillian -->
+                <exclude>**/CallActivityContextSwitchTest.java</exclude>
+                <exclude>**/TestMultipleClasspathRoots.java</exclude>
+                <exclude>**/TestResourceName.java</exclude>
+                <exclude>**/TestWarDeploymentDeployChangedOnlyWithJarAsLib.java</exclude>
+                <exclude>**/TestWarDeploymentWithDiagram.java</exclude>
+                <exclude>**/TestWarDeploymentWithoutDiagram.java</exclude>
+                <exclude>**/TestWarDeploymentWithoutProcessDefinitions.java</exclude>
+                <exclude>**/TestWarDeploymentWithoutProcessesXml.java</exclude>
+                <exclude>**/CdiBeanCallActivityResolutionTest.java</exclude>
+                <exclude>**/CdiBeanCaseTaskResolutionTest.java</exclude>
+                <exclude>**/CallActivityContextSwitchTest.java</exclude>
+                <exclude>**/FailingJobBoundaryTimerWithDelegateVariablesTest.java</exclude>
+                <exclude>**/SignalEventCatchBoundaryWithVariablesTest.java</exclude>
+                <exclude>**/TimerRecalculationTest.java</exclude>
+                <exclude>**/CdiProcessApplicationEventSupportTest.java</exclude>
+                <!-- TODO and weld-servlet-shaded is resolved with integration-tests-engine-jakarta -->
+
+              </excludes>
+              <redirectTestOutputToFile>${redirect.test.output}</redirectTestOutputToFile>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>wildfly</id>
       <dependencies>
diff --git a/qa/integration-tests-engine-jakarta/src/test/java/org/camunda/bpm/integrationtest/util/DeploymentHelper.java b/qa/integration-tests-engine-jakarta/src/test/java/org/camunda/bpm/integrationtest/util/DeploymentHelper.java
index d51a2779806..75678f330af 100644
--- a/qa/integration-tests-engine-jakarta/src/test/java/org/camunda/bpm/integrationtest/util/DeploymentHelper.java
+++ b/qa/integration-tests-engine-jakarta/src/test/java/org/camunda/bpm/integrationtest/util/DeploymentHelper.java
@@ -16,7 +16,9 @@
  */
 package org.camunda.bpm.integrationtest.util;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 
 public class DeploymentHelper extends AbstractDeploymentHelper {
 
@@ -40,4 +42,41 @@ public static JavaArchive[] getEngineSpring() {
     return getEngineSpring(CAMUNDA_ENGINE_SPRING);
   }
 
+  protected static JavaArchive[] getWeld(String engineCdiArtifactName) {
+    if (CACHED_WELD_ASSETS != null) {
+      return CACHED_WELD_ASSETS;
+    } else {
+
+      JavaArchive[] archives = resolveDependenciesFromPomXml(engineCdiArtifactName,
+              "org.jboss.weld.servlet:weld-servlet-shaded"
+      );
+
+      if(archives.length == 0) {
+        throw new RuntimeException("could not resolve the weld implementation and jakarta API dependencies");
+      } else {
+        CACHED_WELD_ASSETS = archives;
+        return CACHED_WELD_ASSETS;
+      }
+    }
+  }
+
+  protected static JavaArchive[] resolveDependenciesFromPomXml(String engineCdiArtifactName, String... dependencyNames) {
+    JavaArchive[] result = new JavaArchive[0];
+    for (String dependencyName : dependencyNames) {
+      JavaArchive[] archive = resolveDependenciesFromPomXml(engineCdiArtifactName, dependencyName);
+      result = (JavaArchive[]) ArrayUtils.addAll(result, archive);
+    }
+
+    return result;
+  }
+
+  protected static JavaArchive[] resolveDependenciesFromPomXml(String engineCdiArtifactName, String dependencyName) {
+      return Maven.configureResolver()
+              .workOffline()
+              .loadPomFromFile("pom.xml")
+              .resolve(engineCdiArtifactName, dependencyName)
+              .withoutTransitivity()
+              .as(JavaArchive.class);
+  }
+
 }
diff --git a/qa/integration-tests-engine-jakarta/src/test/resources-tomcat/arquillian.xml b/qa/integration-tests-engine-jakarta/src/test/resources-tomcat/arquillian.xml
new file mode 100644
index 00000000000..aa982309b1b
--- /dev/null
+++ b/qa/integration-tests-engine-jakarta/src/test/resources-tomcat/arquillian.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian-1.0.xsd">
+
+  <defaultProtocol type="Servlet 5.0" />
+
+  <engine>
+        <property name="deploymentExportPath">target/deployments</property>
+  </engine>
+
+  <container qualifier="tomcat" default="true">
+    <configuration>
+      <property name="catalinaHome">${tomcat.runtime.location}</property>
+      <property name="catalinaBase">${tomcat.runtime.location}</property>
+      <property name="bindHttpPort">${tomcat.connector.http.port}</property>
+      <property name="user">arquillian</property>
+      <property name="pass">arquillian</property>
+      <property name="jmxPort">8089</property>
+      <property name="javaVmArguments">-Xmx512m</property>
+<!--       <property name="javaVmArguments">-Xmx512m -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</property> -->
+    </configuration>
+  </container>
+</arquillian>
diff --git a/qa/integration-tests-engine/pom.xml b/qa/integration-tests-engine/pom.xml
index 0195d758051..e3b0c018072 100644
--- a/qa/integration-tests-engine/pom.xml
+++ b/qa/integration-tests-engine/pom.xml
@@ -497,7 +497,7 @@
     </profile>
 
     <profile>
-      <id>tomcat</id>
+      <id>tomcat9</id>
       <dependencyManagement>
         <dependencies>
           <!-- import internal dependencies before JBoss to preserve internal versions, e.g. for JUnit -->
@@ -521,7 +521,7 @@
         <dependency>
           <!-- make sure this comes after runtime in the reactor build -->
           <groupId>org.camunda.bpm.qa</groupId>
-          <artifactId>camunda-qa-tomcat-runtime</artifactId>
+          <artifactId>camunda-qa-tomcat9-runtime</artifactId>
           <version>${project.version}</version>
           <scope>provided</scope>
           <type>pom</type>
diff --git a/qa/integration-tests-engine/src/test/resources-tomcat/arquillian.xml b/qa/integration-tests-engine/src/test/resources-tomcat/arquillian.xml
index 771173bec55..aa76aaee191 100644
--- a/qa/integration-tests-engine/src/test/resources-tomcat/arquillian.xml
+++ b/qa/integration-tests-engine/src/test/resources-tomcat/arquillian.xml
@@ -10,8 +10,8 @@
 
   <container qualifier="tomcat" default="true">
     <configuration>
-      <property name="catalinaHome">${tomcat.runtime.location}</property>
-      <property name="catalinaBase">${tomcat.runtime.location}</property>
+      <property name="catalinaHome">${tomcat9.runtime.location}</property>
+      <property name="catalinaBase">${tomcat9.runtime.location}</property>
       <property name="bindHttpPort">${tomcat.connector.http.port}</property>
       <property name="user">arquillian</property>
       <property name="pass">arquillian</property>
diff --git a/qa/integration-tests-webapps/shared-engine/pom.xml b/qa/integration-tests-webapps/shared-engine/pom.xml
index a46f5740b6d..31ab5bcf210 100644
--- a/qa/integration-tests-webapps/shared-engine/pom.xml
+++ b/qa/integration-tests-webapps/shared-engine/pom.xml
@@ -247,16 +247,16 @@
     </profile>
 
     <profile>
-      <id>tomcat</id>
+      <id>tomcat9</id>
       <properties>
-        <tomcat.runtime>${basedir}/../${tomcat.runtime.location}</tomcat.runtime>
+        <tomcat.runtime>${basedir}/../${tomcat9.runtime.location}</tomcat.runtime>
         <http.port>${tomcat.connector.http.port}</http.port>
       </properties>
       <dependencies>
         <dependency>
           <!-- make sure it comes after assembly in the build -->
           <groupId>org.camunda.bpm.qa</groupId>
-          <artifactId>camunda-qa-tomcat-runtime</artifactId>
+          <artifactId>camunda-qa-tomcat9-runtime</artifactId>
           <version>${project.version}</version>
           <type>pom</type>
         </dependency>
@@ -352,6 +352,119 @@
       </build>
     </profile>
 
+    <profile>
+      <id>tomcat</id>
+      <properties>
+        <tomcat.runtime>${basedir}/../${tomcat.runtime.location}</tomcat.runtime>
+        <http.port>${tomcat.connector.http.port}</http.port>
+      </properties>
+      <dependencies>
+        <dependency>
+          <!-- make sure it comes after assembly in the build -->
+          <groupId>org.camunda.bpm.qa</groupId>
+          <artifactId>camunda-qa-tomcat-runtime</artifactId>
+          <version>${project.version}</version>
+          <type>pom</type>
+        </dependency>
+        <dependency>
+          <groupId>org.camunda.bpm.webapp</groupId>
+          <artifactId>camunda-webapp-tomcat-jakarta</artifactId>
+          <version>${project.version}</version>
+          <type>war</type>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.camunda.bpm</groupId>
+          <artifactId>camunda-engine-rest-jakarta</artifactId>
+          <version>${project.version}</version>
+          <type>war</type>
+          <scope>test</scope>
+          <classifier>tomcat</classifier>
+        </dependency>
+        <dependency>
+          <groupId>org.camunda.bpm.example</groupId>
+          <artifactId>camunda-example-invoice-jakarta</artifactId>
+          <version>${project.version}</version>
+          <type>war</type>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.cargo</groupId>
+            <artifactId>cargo-maven3-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>start-container</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>start</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>stop-container</id>
+                <phase>post-integration-test</phase>
+                <goals>
+                  <goal>stop</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <!-- Container configuration -->
+              <container>
+                <type>installed</type>
+                <containerId>tomcat10x</containerId>
+                <append>false</append>
+                <home>${tomcat.runtime}</home>
+                <timeout>${cargo.timeout}</timeout>
+              </container>
+              <configuration>
+                <type>standalone</type>
+                <home>${project.build.directory}/config-tomcat</home>
+                <properties>
+                  <cargo.servlet.port>${tomcat.connector.http.port}</cargo.servlet.port>
+                  <cargo.tomcat.ajp.port>${tomcat.connector.ajp.port}</cargo.tomcat.ajp.port>
+                </properties>
+              </configuration>
+              <deployables>
+                <deployable>
+                  <groupId>org.camunda.bpm</groupId>
+                  <artifactId>camunda-engine-rest-jakarta</artifactId>
+                  <type>war</type>
+                  <classifier>tomcat</classifier>
+                  <pingURL>http://localhost:${tomcat.connector.http.port}/engine-rest/engine/default/process-definition</pingURL>
+                  <pingTimeout>${cargo.deploy.timeout}</pingTimeout>
+                  <properties>
+                    <context>engine-rest</context>
+                  </properties>
+                </deployable>
+                <deployable>
+                  <groupId>org.camunda.bpm.webapp</groupId>
+                  <artifactId>camunda-webapp-tomcat-jakarta</artifactId>
+                  <type>war</type>
+                  <pingURL>http://localhost:${tomcat.connector.http.port}/camunda</pingURL>
+                  <pingTimeout>${cargo.deploy.timeout}</pingTimeout>
+                  <properties>
+                    <context>camunda</context>
+                  </properties>
+                </deployable>
+                <deployable>
+                  <groupId>org.camunda.bpm.example</groupId>
+                  <artifactId>camunda-example-invoice-jakarta</artifactId>
+                  <type>war</type>
+                  <properties>
+                    <context>invoice</context>
+                  </properties>
+                </deployable>
+              </deployables>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>distro</id>
       <build>
diff --git a/qa/pom.xml b/qa/pom.xml
index 5626ca97a04..27203bdbc9c 100644
--- a/qa/pom.xml
+++ b/qa/pom.xml
@@ -45,6 +45,7 @@
     <tomcat.server.port>48005</tomcat.server.port>
 
     <tomcat.runtime.location>../tomcat-runtime/target/server/apache-tomcat-${version.tomcat}</tomcat.runtime.location>
+    <tomcat9.runtime.location>../tomcat9-runtime/target/server/apache-tomcat-${version.tomcat9}</tomcat9.runtime.location>
 
   </properties>
 
@@ -124,6 +125,13 @@
       </modules>
     </profile>
 
+    <profile>
+      <id>tomcat9</id>
+      <modules>
+        <module>tomcat9-runtime</module>
+      </modules>
+    </profile>
+
     <profile>
       <id>tomcat</id>
       <modules>
diff --git a/qa/tomcat-runtime/pom.xml b/qa/tomcat-runtime/pom.xml
index bcf373b54fb..7713242484d 100644
--- a/qa/tomcat-runtime/pom.xml
+++ b/qa/tomcat-runtime/pom.xml
@@ -40,12 +40,19 @@
       <artifactId>jython</artifactId>
       <scope>runtime</scope>
     </dependency>
+
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
       <scope>runtime</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.camunda.bpm.qa</groupId>
       <artifactId>camunda-qa-ensure-clean-db</artifactId>
diff --git a/qa/tomcat9-runtime/pom.xml b/qa/tomcat9-runtime/pom.xml
new file mode 100644
index 00000000000..0014d6c2b41
--- /dev/null
+++ b/qa/tomcat9-runtime/pom.xml
@@ -0,0 +1,288 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>camunda-qa-tomcat9-runtime</artifactId>
+  <packaging>pom</packaging>
+
+  <name>Camunda Platform - QA Tomcat 9 Test Runtime</name>
+
+  <parent>
+    <groupId>org.camunda.bpm.qa</groupId>
+    <artifactId>camunda-qa</artifactId>
+    <version>7.22.0-SNAPSHOT</version>
+  </parent>
+
+  <dependencies>
+    <!--
+      database drivers
+      we deploy all and only activate one through server.xml
+    -->
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.python</groupId>
+      <artifactId>jython</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-complete</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.camunda.bpm.qa</groupId>
+      <artifactId>camunda-qa-ensure-clean-db</artifactId>
+      <version>${project.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>tomcat9</id>
+
+      <!-- Tomcat 9 Dependencies used during assembly -->
+      <dependencies>
+
+        <dependency>
+          <groupId>org.apache.tomcat</groupId>
+          <artifactId>tomcat</artifactId>
+          <version>${version.tomcat9}</version>
+          <type>tar.gz</type>
+        </dependency>
+
+        <dependency>
+          <groupId>com.h2database</groupId>
+          <artifactId>h2</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.mybatis</groupId>
+          <artifactId>mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>com.fasterxml.uuid</groupId>
+          <artifactId>java-uuid-generator</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy-jsr223</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy-json</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy-xml</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.codehaus.groovy</groupId>
+          <artifactId>groovy-templates</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.graalvm.js</groupId>
+          <artifactId>js</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>org.graalvm.js</groupId>
+          <artifactId>js-scriptengine</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.camunda.bpm</groupId>
+          <artifactId>camunda-engine</artifactId>
+          <exclusions>
+            <exclusion>
+              <groupId>org.springframework</groupId>
+              <artifactId>spring-beans</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.springframework</groupId>
+              <artifactId>spring-core</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+
+        <dependency>
+          <groupId>org.camunda.bpm.identity</groupId>
+          <artifactId>camunda-identity-ldap</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.camunda.spin</groupId>
+          <artifactId>camunda-spin-core</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.camunda.bpm</groupId>
+          <artifactId>camunda-engine-plugin-spin</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.camunda.spin</groupId>
+          <artifactId>camunda-spin-dataformat-all</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.camunda.connect</groupId>
+          <artifactId>camunda-connect-core</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.camunda.bpm</groupId>
+          <artifactId>camunda-engine-plugin-connect</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.camunda.connect</groupId>
+          <artifactId>camunda-connect-connectors-all</artifactId>
+          <exclusions>
+            <exclusion>
+              <groupId>org.camunda.connect</groupId>
+              <artifactId>camunda-connect-http-client</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.camunda.connect</groupId>
+              <artifactId>camunda-connect-soap-http-client</artifactId>
+            </exclusion>
+          </exclusions>
+          <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.camunda.template-engines</groupId>
+          <artifactId>camunda-template-engines-freemarker</artifactId>
+        </dependency>
+
+        <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-jdk14</artifactId>
+        </dependency>
+
+      </dependencies>
+
+      <build>
+        <resources>
+          <resource>
+            <directory>src/main</directory>
+            <filtering>true</filtering>
+          </resource>
+        </resources>
+
+        <!-- The order of declaration of the plugin executions is important to preserve the correct build sequence of
+             a) packing b) unpacking the server c) copy libs so that the properties are resolved correctly. -->
+        <plugins>
+          <!-- Produces the camunda-qa-tomcat9.tar.gz -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>assemble</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/assembly.xml</descriptor>
+                  </descriptors>
+                  <attach>true</attach>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <outputDirectory>target/</outputDirectory>
+                  <workDirectory>target/assembly/work</workDirectory>
+                  <tarLongFileMode>gnu</tarLongFileMode>
+                  <finalName>camunda-qa-tomcat9</finalName>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- Unpack the assembled Tomcat 9 Server -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>3.0.0</version>
+            <executions>
+              <execution>
+                <id>unpack-tar</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <target>
+                    <untar src="${project.build.directory}/camunda-qa-tomcat9.tar.gz" dest="${project.build.directory}/" compression="gzip"/>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- Copy Runtime Dependencies to the lib folder -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-libs</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>copy-dependencies</goal>
+                </goals>
+                <inherited>false</inherited>
+                <configuration>
+                  <includeScope>runtime</includeScope>
+                  <outputDirectory>${project.build.directory}/server/apache-tomcat-${version.tomcat9}/lib</outputDirectory>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- Copy Filtered Configuration Resources -->
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <configuration>
+              <delimiters>
+                <delimiter>${*}</delimiter>
+              </delimiters>
+              <useDefaultDelimiters>false</useDefaultDelimiters>
+            </configuration>
+            <executions>
+              <execution>
+                <id>copy-resources</id>
+                <phase>generate-test-resources</phase>
+                <goals>
+                  <goal>resources</goal>
+                </goals>
+                <configuration>
+                  <overwrite>true</overwrite>
+                  <outputDirectory>target/server/apache-tomcat-${version.tomcat9}</outputDirectory>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/qa/tomcat9-runtime/src/assembly.xml b/qa/tomcat9-runtime/src/assembly.xml
new file mode 100644
index 00000000000..25ce059e0ab
--- /dev/null
+++ b/qa/tomcat9-runtime/src/assembly.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="urn:maven:assembly:1.1.0-SNAPSHOT">
+    
+  <id>assemble</id>
+    
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <dependencySets>
+   <dependencySet>
+      <outputDirectory>server/</outputDirectory>
+      <includes>
+        <include>org.apache.tomcat:tomcat:tar.gz</include>
+      </includes>
+      <unpackOptions>
+        <excludes>
+          <exclude>**/conf/server.xml</exclude>
+        </excludes>
+      </unpackOptions>
+      <unpack>true</unpack>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>server/apache-tomcat-${version.tomcat9}/lib</outputDirectory>
+      <includes>
+
+        <include>com.h2database:h2:jar</include>
+
+        <include>org.camunda.bpm:camunda-engine:jar</include>
+        <include>org.camunda.bpm.identity:camunda-identity-ldap:jar</include>
+
+        <include>org.mybatis:mybatis:jar:*</include>
+        <include>com.fasterxml.uuid:java-uuid-generator:jar:*</include>
+        <include>joda-time:joda-time:jar:*</include>
+        <include>org.codehaus.groovy:groovy:jar:*</include>
+        <include>org.codehaus.groovy:groovy-jsr223:jar:*</include>
+        <include>org.codehaus.groovy:groovy-json:jar:*</include>
+        <include>org.codehaus.groovy:groovy-xml:jar:*</include>
+        <include>org.codehaus.groovy:groovy-templates:jar:*</include>
+        <include>org.graalvm.js:*</include>
+        <include>org.graalvm.regex:regex:jar:*</include>
+        <include>org.graalvm.truffle:truffle-api:jar:*</include>
+        <include>org.graalvm.sdk:graal-sdk:jar:*</include>
+        <include>com.ibm.icu:icu4j:jar:*</include>
+        <include>org.slf4j:slf4j-api:jar:*</include>
+
+        <include>org.camunda.bpm:camunda-engine-plugin-*:jar</include>
+        <include>org.camunda.spin:camunda-spin-core*:jar</include>
+        <include>org.camunda.spin:camunda-spin-dataformat-all*:jar</include>
+        <include>org.camunda.connect:*:jar</include>
+        <include>org.camunda.commons:*:jar</include>
+
+        <include>org.camunda.bpm.model:*:jar</include>
+        <include>org.camunda.bpm.dmn:*:jar</include>
+        <include>org.camunda.bpm.juel:*:jar</include>
+
+        <include>org.camunda.feel:*:jar</include>
+
+        <include>org.freemarker:*:jar</include>
+        <include>org.camunda.template-engines:*:jar</include>
+      </includes>
+    </dependencySet>
+
+    <dependencySet>
+      <outputDirectory>lib/</outputDirectory>
+      <includes>
+
+        <include>com.h2database:h2:jar</include>
+
+        <include>org.camunda.bpm:camunda-engine:jar</include>
+        <include>org.camunda.bpm.identity:camunda-identity-ldap:jar</include>
+
+        <include>org.mybatis:mybatis:jar:*</include>
+        <include>com.fasterxml.uuid:java-uuid-generator:jar:*</include>
+        <include>joda-time:joda-time:jar:*</include>
+        <include>org.codehaus.groovy:groovy:jar:*</include>
+        <include>org.codehaus.groovy:groovy-jsr223:jar:*</include>
+        <include>org.codehaus.groovy:groovy-json:jar:*</include>
+        <include>org.codehaus.groovy:groovy-xml:jar:*</include>
+        <include>org.codehaus.groovy:groovy-templates:jar:*</include>
+        <include>org.graalvm.js:*</include>
+        <include>org.graalvm.regex:regex:jar:*</include>
+        <include>org.graalvm.truffle:truffle-api:jar:*</include>
+        <include>org.graalvm.sdk:graal-sdk:jar:*</include>
+        <include>com.ibm.icu:icu4j:jar:*</include>
+        <include>org.slf4j:slf4j-api:jar:*</include>
+
+        <include>org.camunda.bpm:camunda-engine-plugin-*:jar</include>
+        <include>org.camunda.spin:camunda-spin-core*:jar</include>
+        <include>org.camunda.spin:camunda-spin-dataformat-all*:jar</include>
+        <include>org.camunda.connect:*:jar</include>
+        <include>org.camunda.commons:*:jar</include>
+
+        <include>org.camunda.bpm.model:*:jar</include>
+
+        <include>org.camunda.bpm.dmn:*:jar</include>
+
+        <include>org.camunda.feel:*:jar</include>
+
+        <include>org.freemarker:*:jar</include>
+        <include>org.camunda.template-engines:*:jar</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+
+  <files>
+    <file>
+      <source>src/main/conf/server.xml</source>
+      <outputDirectory>server/apache-tomcat-${version.tomcat9}/conf/</outputDirectory>
+    </file>
+    
+    <file>
+      <source>src/main/conf/bpm-platform.xml</source>
+      <outputDirectory>server/apache-tomcat-${version.tomcat9}/conf/</outputDirectory>
+    </file>
+  </files>
+</assembly>
diff --git a/qa/tomcat9-runtime/src/main/conf/bpm-platform.xml b/qa/tomcat9-runtime/src/main/conf/bpm-platform.xml
new file mode 100644
index 00000000000..a95ae65bec5
--- /dev/null
+++ b/qa/tomcat9-runtime/src/main/conf/bpm-platform.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpm-platform xmlns="http://www.camunda.org/schema/1.0/BpmPlatform" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.camunda.org/schema/1.0/BpmPlatform http://www.camunda.org/schema/1.0/BpmPlatform ">
+
+  <job-executor>
+    <job-acquisition name="default" />
+  </job-executor>
+
+  <process-engine name="default">
+    <job-acquisition>default</job-acquisition>
+    <configuration>org.camunda.bpm.engine.impl.cfg.StandaloneProcessEngineConfiguration</configuration>
+    <datasource>java:jdbc/ProcessEngine</datasource>
+
+    <properties>
+      <property name="history">full</property>
+      <property name="databaseSchemaUpdate">true</property>
+      <property name="authorizationEnabled">true</property>
+      <property name="jobExecutorDeploymentAware">true</property>
+      <property name="historyCleanupBatchWindowStartTime">00:01</property>
+    </properties>
+
+    <plugins>
+      <!-- plugin enabling Process Application event listener support -->
+      <plugin>
+        <class>org.camunda.bpm.application.impl.event.ProcessApplicationEventListenerPlugin</class>
+      </plugin>
+
+      <!-- plugin enabling integration of camunda Spin -->
+      <plugin>
+        <class>org.camunda.spin.plugin.impl.SpinProcessEnginePlugin</class>
+      </plugin>
+
+      <!-- plugin enabling connect support -->
+      <plugin>
+        <class>org.camunda.connect.plugin.impl.ConnectProcessEnginePlugin</class>
+      </plugin>
+
+    <!-- LDAP CONFIGURATION -->
+    <!-- Uncomment this section in order to enable LDAP support for this process engine -->
+    <!-- Adjust configuration, see ( http://docs.camunda.org/latest/guides/user-guide/#process-engine-identity-service-the-ldap-identity-service ) -->
+    <!--
+      <plugin>
+        <class>org.camunda.bpm.identity.impl.ldap.plugin.LdapIdentityProviderPlugin</class>
+        <properties>
+
+          <property name="serverUrl">ldaps://localhost:4334/</property>
+          <property name="acceptUntrustedCertificates">false</property>
+          <property name="managerDn">uid=jonny,ou=office-berlin,o=camunda,c=org</property>
+          <property name="managerPassword">s3cr3t</property>
+
+          <property name="baseDn">o=camunda,c=org</property>
+
+          <property name="userSearchBase"></property>
+          <property name="userSearchFilter">(objectclass=person)</property>
+
+          <property name="userIdAttribute">uid</property>
+          <property name="userFirstnameAttribute">cn</property>
+          <property name="userLastnameAttribute">sn</property>
+          <property name="userEmailAttribute">mail</property>
+          <property name="userPasswordAttribute">userpassword</property>
+
+          <property name="groupSearchBase"></property>
+          <property name="groupSearchFilter">(objectclass=groupOfNames)</property>
+          <property name="groupIdAttribute">cn</property>
+          <property name="groupNameAttribute">cn</property>
+
+          <property name="groupMemberAttribute">member</property>
+          <property name="sortControlSupported">false</property>
+
+        </properties>
+      </plugin>
+      -->
+
+      <!-- LDAP CONFIGURATION -->
+      <!-- The following plugin allows you to grant administrator authorizations to an existing LDAP user -->
+      <!--
+      <plugin>
+        <class>org.camunda.bpm.engine.impl.plugin.AdministratorAuthorizationPlugin</class>
+        <properties>
+          <property name="administratorUserName">admin</property>
+        </properties>
+      </plugin>
+      -->
+
+    </plugins>
+
+
+  </process-engine>
+
+</bpm-platform>
diff --git a/qa/tomcat9-runtime/src/main/conf/context.xml b/qa/tomcat9-runtime/src/main/conf/context.xml
new file mode 100644
index 00000000000..d84de5879f6
--- /dev/null
+++ b/qa/tomcat9-runtime/src/main/conf/context.xml
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- The contents of this file will be loaded for each web application -->
+<Context antiJarLocking="true" antiResourceLocking="true">
+
+    <!-- Default set of monitored resources. If one of these changes, the    -->
+    <!-- web application will be reloaded.                                   -->
+    <WatchedResource>WEB-INF/web.xml</WatchedResource>
+    <WatchedResource>${catalina.base}/conf/web.xml</WatchedResource>
+
+    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+    <!--
+    <Manager pathname="" />
+    -->
+
+    <!-- Uncomment this to enable Comet connection tacking (provides events
+         on session expiration as well as webapp lifecycle) -->
+    <!--
+    <Valve className="org.apache.catalina.valves.CometConnectionManagerValve" />
+    -->
+
+</Context>
diff --git a/qa/tomcat9-runtime/src/main/conf/server.xml b/qa/tomcat9-runtime/src/main/conf/server.xml
new file mode 100644
index 00000000000..40f1413672b
--- /dev/null
+++ b/qa/tomcat9-runtime/src/main/conf/server.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="${tomcat.server.port}" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  
+  <Listener className="org.camunda.bpm.container.impl.tomcat.TomcatBpmPlatformBootstrap" />
+  
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+              
+	    <!-- Additional properties can be set to avoid a common exception
+         regarding connection timeout in the connection pool:
+          testOnBorrow="true"
+          validationQuery="SELECT 1"
+    -->
+    <Resource name="jdbc/ProcessEngine"
+              auth="Container"
+              type="javax.sql.DataSource" 
+              factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
+              uniqueResourceName="process-engine"
+              driverClassName="${database.driver}" 
+              url="${database.url}"
+              username="${database.username}"
+              password="${database.password}"
+              defaultTransactionIsolation="READ_COMMITTED"
+              maxActive="20"
+              minIdle="5"
+              maxIdle="20" />
+              
+    <Resource name="global/camunda-bpm-platform/process-engine/ProcessEngineService!org.camunda.bpm.ProcessEngineService" auth="Container"
+              type="org.camunda.bpm.ProcessEngineService"
+              description="Camunda Platform Process Engine Service"
+              factory="org.camunda.bpm.container.impl.jndi.ProcessEngineServiceObjectFactory" />
+              
+    <Resource name="global/camunda-bpm-platform/process-engine/ProcessApplicationService!org.camunda.bpm.ProcessApplicationService" auth="Container"
+              type="org.camunda.bpm.ProcessApplicationService"
+              description="Camunda Platform Process Application Service"
+              factory="org.camunda.bpm.container.impl.jndi.ProcessApplicationServiceObjectFactory" />              
+              
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="${tomcat.connector.http.port}" protocol="HTTP/1.1" 
+               connectionTimeout="20000" 
+               redirectPort="${tomcat.connector.http.redirectPort}" />
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector protocol="AJP/1.3"
+               port="${tomcat.connector.ajp.port}"
+               redirectPort="${tomcat.connector.ajp.redirectPort}"
+               secretRequired="false" />
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/qa/tomcat9-runtime/src/main/conf/tomcat-users.xml b/qa/tomcat9-runtime/src/main/conf/tomcat-users.xml
new file mode 100644
index 00000000000..b549144bd5e
--- /dev/null
+++ b/qa/tomcat9-runtime/src/main/conf/tomcat-users.xml
@@ -0,0 +1,44 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<tomcat-users xmlns="http://tomcat.apache.org/xml"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
+              version="1.0">
+<!--
+  NOTE:  By default, no user is included in the "manager-gui" role required
+  to operate the "/manager/html" web application.  If you wish to use this app,
+  you must define such a user - the username and password are arbitrary.
+-->
+<!--
+  NOTE:  The sample user and role entries below are wrapped in a comment
+  and thus are ignored when reading this file. Do not forget to remove
+  <!.. ..> that surrounds them.
+-->
+<!--
+  <role rolename="tomcat"/>
+  <role rolename="role1"/>
+  <user username="tomcat" password="tomcat" roles="tomcat"/>
+  <user username="both" password="tomcat" roles="tomcat,role1"/>
+  <user username="role1" password="tomcat" roles="role1"/>
+-->
+
+  <role rolename="manager-script"/>
+  
+  <user username="arquillian" password="arquillian" roles="manager-script"/>
+
+</tomcat-users>
diff --git a/qa/tomcat9-runtime/src/tomcat/setenv.bat b/qa/tomcat9-runtime/src/tomcat/setenv.bat
new file mode 100644
index 00000000000..80d8c983ae8
--- /dev/null
+++ b/qa/tomcat9-runtime/src/tomcat/setenv.bat
@@ -0,0 +1 @@
+set CATALINA_OPTS=-Xmx512m
diff --git a/qa/tomcat9-runtime/src/tomcat/setenv.sh b/qa/tomcat9-runtime/src/tomcat/setenv.sh
new file mode 100644
index 00000000000..86f2b167168
--- /dev/null
+++ b/qa/tomcat9-runtime/src/tomcat/setenv.sh
@@ -0,0 +1 @@
+export CATALINA_OPTS="-Xmx512m"
diff --git a/webapps/assembly-jakarta/pom.xml b/webapps/assembly-jakarta/pom.xml
index a64513fd829..c684592707b 100644
--- a/webapps/assembly-jakarta/pom.xml
+++ b/webapps/assembly-jakarta/pom.xml
@@ -18,7 +18,7 @@
     <jakarta.webapp>${project.build.directory}/generated-resources/jakarta-webapp</jakarta.webapp>
     <jakarta.runtime>${project.build.directory}/generated-resources/jakarta-runtime</jakarta.runtime>
 
-    <version.resteasy>6.2.3.Final</version.resteasy>
+    <version.resteasy>6.2.8.Final</version.resteasy>
     <version.jetty>11.0.14</version.jetty>
     <version.jersey2>3.1.1</version.jersey2>