diff --git a/bom/pom.xml b/bom/pom.xml
index 44220df8b8af..13457f562304 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -319,11 +319,6 @@ THE SOFTWARE.
         <artifactId>symbol-annotation</artifactId>
         <version>1.1</version>
       </dependency>
-      <dependency>
-        <groupId>com.sun.mail</groupId>
-        <artifactId>jakarta.mail</artifactId>
-        <version>1.6.5</version>
-      </dependency>
 
       <!--XStream-->
       <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 0b10a40a0d22..28fbaaaf812b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -280,10 +280,6 @@ THE SOFTWARE.
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.sun.mail</groupId>
-      <artifactId>jakarta.mail</artifactId>
-    </dependency>
     <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
diff --git a/core/src/main/resources/jenkins/split-plugin-cycles.txt b/core/src/main/resources/jenkins/split-plugin-cycles.txt
index 3cec061d7eb0..848ede384feb 100644
--- a/core/src/main/resources/jenkins/split-plugin-cycles.txt
+++ b/core/src/main/resources/jenkins/split-plugin-cycles.txt
@@ -32,3 +32,7 @@ junit jaxb
 bouncycastle-api jaxb
 command-launcher jaxb
 jdk-tool jaxb
+
+javax-activation-api javax-mail-api
+javax-activation-api sshd
+javax-mail-api sshd
diff --git a/core/src/main/resources/jenkins/split-plugins.txt b/core/src/main/resources/jenkins/split-plugins.txt
index 0bb03189d9c8..823c851988cc 100644
--- a/core/src/main/resources/jenkins/split-plugins.txt
+++ b/core/src/main/resources/jenkins/split-plugins.txt
@@ -34,3 +34,6 @@ trilead-api 2.184 1.0.4
 
 # JENKINS-64107
 sshd 2.281 3.0.1
+
+javax-activation-api 2.330 1.2.0-2
+javax-mail-api 2.330 1.6.2-5
diff --git a/test/pom.xml b/test/pom.xml
index bf637e7d9117..2ad18d671982 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -121,6 +121,12 @@ THE SOFTWARE.
       <version>391.ve4a_38c1b_cf4b_</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.jenkins.plugins</groupId>
+      <artifactId>javax-mail-api</artifactId>
+      <version>1.6.2-5</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-auth</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index e71473d30ca0..e0c5d5f6e171 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -367,6 +367,18 @@ THE SOFTWARE.
                   <version>1.0.4</version>
                   <type>hpi</type>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>io.jenkins.plugins</groupId>
+                  <artifactId>javax-activation-api</artifactId>
+                  <version>1.2.0-2</version>
+                  <type>hpi</type>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>io.jenkins.plugins</groupId>
+                  <artifactId>javax-mail-api</artifactId>
+                  <version>1.6.2-5</version>
+                  <type>hpi</type>
+                </artifactItem>
               </artifactItems>
               <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/detached-plugins</outputDirectory>
               <stripVersion>true</stripVersion>