diff --git a/zookeeper.yaml b/zookeeper.yaml
index 18880091902..af9ecf71b96 100644
--- a/zookeeper.yaml
+++ b/zookeeper.yaml
@@ -1,8 +1,7 @@
 package:
   name: zookeeper
-  # When bumping, check to see if the CVE mitigations below can be removed.
-  version: "3.8.1"
-  epoch: 2
+  version: 3.8.2.0
+  epoch: 0
   description:
   target-architecture:
     - all
@@ -16,6 +15,16 @@ package:
       - bash # some helper scripts use bash
       - openjdk-17-default-jvm
 
+var-transforms:
+  - from: ${{package.version}}
+    match: \.(\d+)$
+    replace: "-$1"
+    to: mangled-package-version
+  - from: ${{package.version}}
+    match: ^(\d+\.\d+\.\d+)\.\d+$
+    replace: "$1"
+    to: short-package-version
+
 environment:
   contents:
     packages:
@@ -30,18 +39,15 @@ pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/apache/zookeeper
-      tag: release-${{package.version}}
-      expected-commit: 74db005175a4ec545697012f9069cb9dcc8cdda7
+      tag: release-${{vars.mangled-package-version}}
+      expected-commit: 139d619b58292d7734b4fc83a0f44be4e7b0c986
 
   - runs: |
       export LANG=en_US.UTF-8
       export JAVA_HOME=/usr/lib/jvm/java-17-openjdk
 
-      # Mitigate CVE-2023-26048 and CVE-2023-26049 by bumping jetty
-      sed -i 's/\(<jetty.version>\)[^<]\+/\19.4.51.v20230217/' pom.xml
-
       mvn install -DskipTests
-      tar -xf zookeeper-assembly/target/apache-zookeeper-${{package.version}}-bin.tar.gz
+      tar -xf zookeeper-assembly/target/apache-zookeeper-${{vars.short-package-version}}-bin.tar.gz
 
       mkdir -p ${{targets.destdir}}/usr/share/java/zookeeper
       mkdir -p ${{targets.destdir}}/usr/share/java/zookeeper/bin
@@ -49,16 +55,17 @@ pipeline:
       mkdir -p ${{targets.destdir}}/usr/share/java/zookeeper/conf
 
       # Clean up windows files
-      rm -rf apache-zookeeper-${{package.version}}-bin/bin/*.cmd
-      mv apache-zookeeper-${{package.version}}-bin/lib/* ${{targets.destdir}}/usr/share/java/zookeeper/lib
-      mv apache-zookeeper-${{package.version}}-bin/bin/* ${{targets.destdir}}/usr/share/java/zookeeper/bin
-      mv apache-zookeeper-${{package.version}}-bin/conf/* ${{targets.destdir}}/usr/share/java/zookeeper/conf
+      rm -rf apache-zookeeper-${{vars.short-package-version}}-bin/bin/*.cmd
+      mv apache-zookeeper-${{vars.short-package-version}}-bin/lib/* ${{targets.destdir}}/usr/share/java/zookeeper/lib
+      mv apache-zookeeper-${{vars.short-package-version}}-bin/bin/* ${{targets.destdir}}/usr/share/java/zookeeper/bin
+      mv apache-zookeeper-${{vars.short-package-version}}-bin/conf/* ${{targets.destdir}}/usr/share/java/zookeeper/conf
 
       # Setup a sample conf
       cp ${{targets.destdir}}/usr/share/java/zookeeper/conf/zoo_sample.cfg ${{targets.destdir}}/usr/share/java/zookeeper/conf/zoo.cfg
 
 update:
   enabled: true
+  version-separator: "-"
   github:
     tag-filter: release-
     identifier: apache/zookeeper