diff --git a/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md
index 8cdd8472c5d4..c406c10f73fb 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md
+++ b/sdk/keyvault/azure-security-keyvault-jca/CHANGELOG.md
@@ -8,6 +8,7 @@
### Bugs Fixed
- Fixed the NPE where the token object was not returned when the credential information was incorrect.
+- Fixed an issue where release-specific classes from BouncyCastle were not properly shaded for Java 9 and above, leading to potential class loading issues in multi-release JARs. ([#47127](https://github.com/Azure/azure-sdk-for-java/pull/47127))
### Other Changes
- Included the `org.brotli:dec` library in the list of shaded dependencies to avoid issues when generating and publishing docs to MSLearn.
diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml
index c575d94605f5..b955be59cec9 100644
--- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml
+++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml
@@ -162,6 +162,11 @@
META-INF/*.DSA
META-INF/*.RSA
META-INF/services/java.security.Provider
+
+ **/OSGI-INF/**
+
+ **/module-info.class
@@ -170,6 +175,21 @@
org.bouncycastle
com.azure.security.keyvault.jca.implementation.shaded.org.bouncycastle
+
+
+ META-INF/versions/(\d+)/org/bouncycastle
+ META-INF/versions/$1/com/azure/security/keyvault/jca/implementation/shaded/org/bouncycastle
+ true
+