diff --git a/multiapps-controller-persistence/pom.xml b/multiapps-controller-persistence/pom.xml
index af7d6c28f5..24c3d86b5b 100644
--- a/multiapps-controller-persistence/pom.xml
+++ b/multiapps-controller-persistence/pom.xml
@@ -213,7 +213,7 @@
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk18on</artifactId>
+            <artifactId>bcpkix-fips</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
diff --git a/multiapps-controller-persistence/src/main/java/module-info.java b/multiapps-controller-persistence/src/main/java/module-info.java
index 3411f802eb..8444e460b8 100644
--- a/multiapps-controller-persistence/src/main/java/module-info.java
+++ b/multiapps-controller-persistence/src/main/java/module-info.java
@@ -26,7 +26,6 @@
     requires transitive jclouds.core;
     requires transitive org.cloudfoundry.multiapps.mta;
     requires transitive org.cloudfoundry.multiapps.controller.api;
-    requires transitive org.bouncycastle.pkix;
 
     requires aliyun.sdk.oss;
     requires com.fasterxml.jackson.annotation;
@@ -52,5 +51,6 @@
     requires static java.compiler;
     requires static org.immutables.value;
     requires jakarta.xml.bind;
+    requires org.bouncycastle.fips.pkix;
 
 }
diff --git a/pom.xml b/pom.xml
index db1d51785d..89d1c7ef80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <jaxb-impl.version>4.0.5</jaxb-impl.version>
         <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
         <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
-        <bouncycastle.version>1.80</bouncycastle.version>
+        <bouncycastle.version>2.1.9</bouncycastle.version>
         <apache.compress.version>1.27.1</apache.compress.version>
         <tika-core.version>3.1.0</tika-core.version>
     </properties>
@@ -800,10 +800,10 @@
                 <artifactId>resilience4j-ratelimiter</artifactId>
                 <version>${resilience4j.version}</version>
             </dependency>
-            <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on -->
+            <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-fips -->
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk18on</artifactId>
+                <artifactId>bcpkix-fips</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
             <!-- https://mvnrepository.com/artifact/io.pivotal.cfenv/java-cfenv -->