diff --git a/Jenkinsfile b/Jenkinsfile
index 3a498791008..911ef58f3e6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -96,7 +96,7 @@ pipeline {
         stage('Stable Tests') {
             steps {
                 echo 'Running tests'
-                sh 'mvn -B -e -fae clean test ${MVN_SHOW_TIMESTAMPS} -P ci-test ${MVN_LOCAL_REPO_OPT} -Dassembly.skipAssembly=true -Dapi.version=1.44 jacoco:report-aggregate@jacoco-report'
+                sh 'mvn -B -e -fae clean test ${MVN_SHOW_TIMESTAMPS} -P ci-test ${MVN_LOCAL_REPO_OPT} -Dassembly.skipAssembly=true jacoco:report-aggregate@jacoco-report'
             }
             post {
                 always {
@@ -117,7 +117,7 @@ pipeline {
             steps {
                 echo 'Running unstable tests'
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    sh 'mvn -B -e -fae clean test -Punstable-tests ${MVN_SHOW_TIMESTAMPS} -P ci-test ${MVN_LOCAL_REPO_OPT} -Dassembly.skipAssembly=true -Dapi.version=1.44'
+                    sh 'mvn -B -e -fae clean test -Punstable-tests ${MVN_SHOW_TIMESTAMPS} -P ci-test ${MVN_LOCAL_REPO_OPT} -Dassembly.skipAssembly=true'
                 }
             }
             post {
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index 096c751d963..7846b7cbaa4 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -69,6 +69,11 @@
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+        </dependency>
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
diff --git a/pom.xml b/pom.xml
index 5e3c4ad094b..2d970f766a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -653,7 +653,8 @@
         <feign-form.version>3.8.0</feign-form.version>
         <jjwt.version>0.12.6</jjwt.version>
         <metrics.version>4.2.32</metrics.version>
-        <testcontainers.version>1.21.1</testcontainers.version>
+        <testcontainers.version>2.0.2</testcontainers.version>
+        <testcontainers.modules.version>1.21.1</testcontainers.modules.version>
         <es-reporter.version>6.0.0-RC3</es-reporter.version>
         <guava.version>33.4.8-jre</guava.version>
 
@@ -3010,22 +3011,22 @@
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>junit-jupiter</artifactId>
-                <version>${testcontainers.version}</version>
+                <version>${testcontainers.modules.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>mariadb</artifactId>
-                <version>${testcontainers.version}</version>
+                <version>${testcontainers.modules.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>postgresql</artifactId>
-                <version>${testcontainers.version}</version>
+                <version>${testcontainers.modules.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
                 <artifactId>pulsar</artifactId>
-                <version>${testcontainers.version}</version>
+                <version>${testcontainers.modules.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.testcontainers</groupId>
diff --git a/server/apps/jpa-smtp-app/pom.xml b/server/apps/jpa-smtp-app/pom.xml
index a8307dab257..cc3aeb34253 100644
--- a/server/apps/jpa-smtp-app/pom.xml
+++ b/server/apps/jpa-smtp-app/pom.xml
@@ -189,7 +189,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mariadb</artifactId>
-            <version>${testcontainers.version}</version>
+            <version>${testcontainers.modules.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>