diff --git a/apache-pulsar.yaml b/apache-pulsar.yaml
index 221b22c5854..98a68d80d4f 100644
--- a/apache-pulsar.yaml
+++ b/apache-pulsar.yaml
@@ -1,7 +1,7 @@
 package:
   name: apache-pulsar
   version: 4.0.1
-  epoch: 1
+  epoch: 2
   description: Pulsar is a distributed pub-sub messaging platform with a very flexible messaging model and an intuitive client API.
   copyright:
     - license: Apache-2.0
@@ -9,14 +9,16 @@ package:
     runtime:
       - bash
       - libstdc++
-      - openjdk-17-jre
+      - openjdk-21-jre
+      - openssl
+      - procps
 
 environment:
   contents:
     packages:
       - busybox
       - maven
-      - openjdk-17-default-jdk
+      - openjdk-21-default-jdk
 
 pipeline:
   - uses: git-checkout
@@ -25,6 +27,10 @@ pipeline:
       tag: v${{package.version}}
       expected-commit: 3ea527bf6b720dcfe074c4476257cce96ebc068a
 
+  - uses: patch
+    with:
+      patches: bouncy-castle-bcfips.patch
+
   - uses: maven/pombump
 
   - name: Build
@@ -62,9 +68,10 @@ test:
         - ${{package.name}}-compat
         - bash
         - libstdc++
+        - procps
     environment:
-      JAVA_HOME: /usr/lib/jvm/java-17-openjdk
-      PATH: /usr/lib/jvm/java-17-openjdk/bin:$PATH
+      JAVA_HOME: /usr/lib/jvm/java-21-openjdk
+      PATH: /usr/lib/jvm/java-21-openjdk/bin:$PATH
   pipeline:
     - name: Test that all CLI tools are at least installed
       runs: |
diff --git a/apache-pulsar/bouncy-castle-bcfips.patch b/apache-pulsar/bouncy-castle-bcfips.patch
new file mode 100644
index 00000000000..31c839798c9
--- /dev/null
+++ b/apache-pulsar/bouncy-castle-bcfips.patch
@@ -0,0 +1,15 @@
+diff --git a/pom.xml b/pom.xml
+index 2a91978af8..dfee3a3b77 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -159,8 +159,8 @@ flexible messaging model and an intuitive client API.</description>
+     <commons.collections4.version>4.4</commons.collections4.version>
+     <log4j2.version>2.23.1</log4j2.version>
+     <bouncycastle.version>1.78.1</bouncycastle.version>
+-    <bouncycastle.bcpkix-fips.version>1.0.7</bouncycastle.bcpkix-fips.version>
+-    <bouncycastle.bc-fips.version>1.0.2.5</bouncycastle.bc-fips.version>
++    <bouncycastle.bcpkix-fips.version>2.0.7</bouncycastle.bcpkix-fips.version>
++    <bouncycastle.bc-fips.version>2.0.0</bouncycastle.bc-fips.version>
+     <jackson.version>2.17.2</jackson.version>
+     <fastutil.version>8.5.14</fastutil.version>
+     <reflections.version>0.10.2</reflections.version>