diff --git a/distribution/server/pom.xml b/distribution/server/pom.xml
index 381ac6a..66af231 100644
--- a/distribution/server/pom.xml
+++ b/distribution/server/pom.xml
@@ -42,6 +42,14 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>bouncy-castle-bc</artifactId>
+      <version>${project.version}</version>
+      <classifier>pkg</classifier>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>pulsar-discovery-service</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -146,7 +154,7 @@
           <groupId>io.grpc</groupId>
           <artifactId>*</artifactId>
         </exclusion>
-        <!-- bouncy-castle-bc-shaded already contains this-->
+        <!-- bouncy-castle-bc already contains this-->
         <exclusion>
           <groupId>org.bouncycastle</groupId>
           <artifactId>*</artifactId>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index 899b8e4..0f0ace0 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -583,6 +583,12 @@
  * Jcip -- licenses/LICENSE-jcip.txt
     - net.jcip-jcip-annotations-1.0.jar
 
+Bouncy Castle License
+ * Bouncy Castle -- licenses/LICENSE-bouncycastle.txt
+    - org.bouncycastle-bcpkix-jdk15on-1.66.jar
+    - org.bouncycastle-bcprov-ext-jdk15on-1.66.jar
+    - org.bouncycastle-bcprov-jdk15on-1.66.jar
+
 ------------------------
 
 Additionaly, Netty includes code with the following licenses:
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index 295339c..3219d3a 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -56,6 +56,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.pulsar</groupId>
+      <artifactId>bouncy-castle-bc</artifactId>
+      <version>${project.version}</version>
+      <classifier>pkg</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pulsar</groupId>
       <artifactId>pulsar-client-admin</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/tests/pulsar-kafka-compat-client-test/pom.xml b/tests/pulsar-kafka-compat-client-test/pom.xml
index e77cb8d..d0adddc 100644
--- a/tests/pulsar-kafka-compat-client-test/pom.xml
+++ b/tests/pulsar-kafka-compat-client-test/pom.xml
@@ -64,6 +64,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.pulsar</groupId>
+      <artifactId>bouncy-castle-bc</artifactId>
+      <version>${project.version}</version>
+      <classifier>pkg</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pulsar</groupId>
       <artifactId>pulsar-client-kafka</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
diff --git a/tests/pulsar-storm-test/pom.xml b/tests/pulsar-storm-test/pom.xml
index a0fef6e..0a0d524 100644
--- a/tests/pulsar-storm-test/pom.xml
+++ b/tests/pulsar-storm-test/pom.xml
@@ -47,7 +47,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    
+
      <dependency>
       <groupId>org.apache.storm</groupId>
       <artifactId>storm-server</artifactId>
@@ -67,6 +67,14 @@
 
     <dependency>
       <groupId>org.apache.pulsar</groupId>
+      <artifactId>bouncy-castle-bc</artifactId>
+      <version>${project.version}</version>
+      <classifier>pkg</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.pulsar</groupId>
       <artifactId>pulsar-broker</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>