diff --git a/docker-workitem/pom.xml b/docker-workitem/pom.xml
index 210c4a868..63bfc8ad8 100644
--- a/docker-workitem/pom.xml
+++ b/docker-workitem/pom.xml
@@ -25,6 +25,14 @@
           <groupId>log4j</groupId>
           <artifactId>log4j</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcpkix-jdk15on</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/ethereum-workitem/pom.xml b/ethereum-workitem/pom.xml
index 69aa58483..bf78ab249 100644
--- a/ethereum-workitem/pom.xml
+++ b/ethereum-workitem/pom.xml
@@ -40,6 +40,12 @@
       <groupId>org.web3j</groupId>
       <artifactId>utils</artifactId>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>
@@ -134,6 +140,12 @@
       <artifactId>template-resources</artifactId>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15to18</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/pdf-workitem/pom.xml b/pdf-workitem/pom.xml
index d4e9e5701..abaa650e3 100644
--- a/pdf-workitem/pom.xml
+++ b/pdf-workitem/pom.xml
@@ -39,11 +39,11 @@
     <!-- needed for itext optional depends -->
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcprov-jdk15to18</artifactId>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk15to18</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.santuario</groupId>
diff --git a/pom.xml b/pom.xml
index 2e55934ef..98e7f07f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,12 +340,12 @@
 
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk15on</artifactId>
+        <artifactId>bcprov-jdk15to18</artifactId>
         <version>${version.bouncycastle}</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk15on</artifactId>
+        <artifactId>bcpkix-jdk15to18</artifactId>
         <version>${version.bouncycastle}</version>
       </dependency>
       <dependency>