diff --git a/modules/flowable-mail/pom.xml b/modules/flowable-mail/pom.xml
index 6cf88fbd98d..e48f4a73f67 100644
--- a/modules/flowable-mail/pom.xml
+++ b/modules/flowable-mail/pom.xml
@@ -21,8 +21,15 @@
             org.flowable.mail.common.api,
             org.flowable.mail.common.api.client,
             org.flowable.mail.common.impl,
-            org.flowable.mail.common.impl.apache.commons
+            org.flowable.mail.common.impl.jakarta.mail
         </flowable.osgi.export.additional>
+        <flowable.osgi.import.additional>
+            jakarta.mail*;resolution:=optional,
+            jakarta.activation*;resolution:=optional,
+            com.fasterxml.jackson*;resolution:=optional,
+            org.slf4j*;resolution:=optional,
+            org.apache.commons.lang3*;resolution:=optional,
+        </flowable.osgi.import.additional>
     </properties>
 
     <build>
diff --git a/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java b/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java
index 1cd46368903..a8001b9135b 100755
--- a/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java
+++ b/modules/flowable-osgi/src/test/java/org/flowable/osgi/blueprint/BlueprintBasicTest.java
@@ -123,8 +123,11 @@ public Option[] createConfiguration() {
                 mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").versionAsInProject(),
                 mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-databind").versionAsInProject(),
                 mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").versionAsInProject(),
+                mavenBundle().groupId("jakarta.activation").artifactId("jakarta.activation-api").versionAsInProject(),
+                mavenBundle().groupId("jakarta.mail").artifactId("jakarta.mail-api").versionAsInProject(),
                 mavenBundle().groupId("joda-time").artifactId("joda-time").versionAsInProject(),
                 mavenBundle().groupId("com.h2database").artifactId("h2").versionAsInProject(),
+                mavenBundle().groupId("org.eclipse.angus").artifactId("angus-mail").versionAsInProject(),
                 mavenBundle().groupId("org.mybatis").artifactId("mybatis").versionAsInProject(),
                 mavenBundle().groupId("org.liquibase").artifactId("liquibase-core").versionAsInProject(),
                 mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").versionAsInProject(),