diff --git a/engine-cdi/compatibility-test-weld3/pom.xml b/engine-cdi/compatibility-test-weld3/pom.xml
deleted file mode 100644
index 70ba96944d3..00000000000
--- a/engine-cdi/compatibility-test-weld3/pom.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <name>Camunda Platform - engine - Cdi - Compatbility Test Weld 3</name>
-  <artifactId>camunda-engine-cdi-compatibility-test-weld3</artifactId>
-  <packaging>jar</packaging>
-
-  <parent>
-    <groupId>org.camunda.bpm</groupId>
-    <artifactId>camunda-database-settings</artifactId>
-    <relativePath>../../database</relativePath>
-    <version>7.20.0-SNAPSHOT</version>
-  </parent>
-
-  <properties>
-    <arquillian.container.version>2.1.0.Final</arquillian.container.version>
-    <arquillian.junit.version>1.6.0.Final</arquillian.junit.version>
-    <weld.version>3.1.9.Final</weld.version>
-    <javaee.spec>jboss-javaee-8.0</javaee.spec>
-    <javaee.spec.version>1.0.4.Final</javaee.spec.version>
-  </properties>
-  
-  <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>
-      <dependency>
-        <groupId>org.jboss.weld</groupId>
-        <artifactId>weld-core-bom</artifactId>
-        <version>${weld.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <!-- engine CDI artifact and tests -->
-    <dependency>
-      <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-cdi</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>livetribe-jsr223</artifactId>
-          <groupId>org.livetribe</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-cdi</artifactId>
-      <classifier>tests</classifier>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.spec</groupId>
-      <artifactId>${javaee.spec}</artifactId>
-      <version>${javaee.spec.version}</version>
-      <type>pom</type>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.arquillian.container</groupId>
-      <artifactId>arquillian-weld-embedded</artifactId>
-      <version>${arquillian.container.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.weld</groupId>
-      <artifactId>weld-core-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.weld.module</groupId>
-      <artifactId>weld-web</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.weld</groupId>
-      <artifactId>weld-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.arquillian.junit</groupId>
-      <artifactId>arquillian-junit-container</artifactId>
-      <version>${arquillian.junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>    
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jul-to-slf4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <dependenciesToScan>
-            <dependency>org.camunda.bpm:camunda-engine-cdi</dependency>
-          </dependenciesToScan>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          <trimStackTrace>false</trimStackTrace>
-          <failIfNoTests>false</failIfNoTests>
-          <argLine>-Denvironment=EE</argLine>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
\ No newline at end of file
diff --git a/engine-cdi/core/pom.xml b/engine-cdi/core/pom.xml
index c235ce8a2e2..06e96f9dbda 100644
--- a/engine-cdi/core/pom.xml
+++ b/engine-cdi/core/pom.xml
@@ -13,6 +13,14 @@
     <version>7.20.0-SNAPSHOT</version>
   </parent>
 
+  <properties>
+    <arquillian.container.version>2.1.0.Final</arquillian.container.version>
+    <arquillian.junit.version>1.6.0.Final</arquillian.junit.version>
+    <weld.version>3.1.9.Final</weld.version>
+    <javaee.spec>jboss-javaee-8.0</javaee.spec>
+    <javaee.spec.version>1.0.4.Final</javaee.spec.version>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -25,7 +33,7 @@
       <dependency>
         <groupId>org.jboss.weld</groupId>
         <artifactId>weld-core-bom</artifactId>
-        <version>1.1.11.Final</version>
+        <version>${weld.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -44,28 +52,39 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>javax.enterprise.concurrent</groupId>
-      <artifactId>javax.enterprise.concurrent-api</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.jboss.spec</groupId>
-      <artifactId>jboss-javaee-6.0</artifactId>
+      <artifactId>${javaee.spec}</artifactId>
+      <version>${javaee.spec.version}</version>
       <type>pom</type>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>xalan</artifactId>
-          <groupId>org.apache.xalan</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.arquillian.container</groupId>
+      <artifactId>arquillian-weld-embedded</artifactId>
+      <version>${arquillian.container.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.weld</groupId>
+      <artifactId>weld-core-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.weld.module</groupId>
+      <artifactId>weld-web</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.weld</groupId>
+      <artifactId>weld-api</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.junit</groupId>
       <artifactId>arquillian-junit-container</artifactId>
+      <version>${arquillian.junit.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -106,106 +125,6 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>distro</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.jboss.arquillian.container</groupId>
-          <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.weld</groupId>
-          <artifactId>weld-core</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.weld</groupId>
-          <artifactId>weld-core-test</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.jboss.weld</groupId>
-          <artifactId>weld-api</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>openwebbeans-embedded-1</id>
-      <dependencies>
-        <dependency>
-          <groupId>org.jboss.arquillian.container</groupId>
-          <artifactId>arquillian-openwebbeans-embedded-1</artifactId>
-          <version>1.0.0.CR2</version>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.openwebbeans</groupId>
-          <artifactId>openwebbeans-spi</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.openwebbeans</groupId>
-          <artifactId>openwebbeans-impl</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans</artifactId>
-            <version>1.1.3</version>
-            <type>pom</type>
-            <scope>import</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
-    <!-- The test suite does not run on Java 16 and higher due to the old Weld version.
-      We test Java 17+ compatibility in the sibling module compatibility-test-weld3 -->
-    <profile>
-      <id>java16</id>
-      <activation>
-        <jdk>[16,)</jdk>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <configuration>
-                <skipTests>true</skipTests>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-  </profiles>
-
   <build>
     <resources>
       <resource>
@@ -213,9 +132,21 @@
       </resource>
     </resources>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
         <configuration>
           <failIfNoTests>false</failIfNoTests>
           <trimStackTrace>false</trimStackTrace>
@@ -224,35 +155,6 @@
             <dependency>org.camunda.bpm:camunda-bpm-archunit</dependency>
           </dependenciesToScan>
         </configuration>
-        <dependencies>
-          <!-- Force using the JUnit provider -->
-          <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-junit47</artifactId>
-            <version>2.22.2</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.2.2</version>
-        <configuration>
-          <useDefaultManifestFile combine.self="override" />
-        </configuration>
-        <executions>
-          <!-- create test jar that is consumed by the weld3 tests -->
-          <execution>
-            <id>create-test-jar-weld</id>
-            <phase>package</phase>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-            <configuration>
-              <forceCreation>true</forceCreation>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
diff --git a/engine-cdi/pom.xml b/engine-cdi/pom.xml
index f7450c33ce8..ec17267a4c5 100644
--- a/engine-cdi/pom.xml
+++ b/engine-cdi/pom.xml
@@ -13,16 +13,8 @@
   <packaging>pom</packaging>
   <name>Camunda Platform - engine - CDI - Root</name>
 
-  <!--
-  Why this module structure?
-  Core is the user-facing camunda-engine-cdi artifact and is compiled against Weld 1.1.11.Final.
-  The compatibility module runs the tests contained in core with Weld 3.x.
-  This is implemented as a separate module and not as a profile of the core module, in order
-  to test the artifact that was compiled against Weld 1.1.11.Final (i.e. to ensure binary compatibility).
-  -->
   <modules>
     <module>core</module>
-    <module>compatibility-test-weld3</module>
   </modules>
 
   <profiles>
diff --git a/qa/integration-tests-engine/pom.xml b/qa/integration-tests-engine/pom.xml
index 58e788d5065..fb3a16f84ca 100644
--- a/qa/integration-tests-engine/pom.xml
+++ b/qa/integration-tests-engine/pom.xml
@@ -239,7 +239,7 @@
     <dependency>
       <groupId>org.jboss.weld.servlet</groupId>
       <artifactId>weld-servlet</artifactId>
-      <version>1.1.10.Final</version>
+      <version>2.4.8.Final</version>
       <scope>test</scope>
     </dependency>
 
@@ -483,7 +483,7 @@
                 <exclude>**/BusinessRuleTaskVersionTagTest.java</exclude>
                 <!-- CAM-1778 -->
                 <exludes>**/TestWarDeploymentWithProcessEnginePlugin.java</exludes>
-                
+
                 <exclude>**/SpringServletPATimerStartEventExpressionTest.java</exclude>
               </excludes>
               <redirectTestOutputToFile>${redirect.test.output}</redirectTestOutputToFile>