diff --git a/zookeeper-3.9.yaml b/zookeeper-3.9.yaml
index eb7b72b9c43..6597a2f1aaf 100644
--- a/zookeeper-3.9.yaml
+++ b/zookeeper-3.9.yaml
@@ -1,7 +1,7 @@
 package:
   name: zookeeper-3.9
   version: "3.9.4"
-  epoch: 2 # GHSA-qqpg-mvqg-649v
+  epoch: 3
   description: Distributed, highly available, robust, fault-tolerant system for distributed coordination
   copyright:
     - license: Apache-2.0
@@ -61,7 +61,7 @@ pipeline:
       # Install Zookeeper
       mv apache-zookeeper-${{package.version}}-bin/bin ${{targets.destdir}}/usr/share/java/zookeeper
       mv apache-zookeeper-${{package.version}}-bin/lib ${{targets.destdir}}/usr/share/java/zookeeper
-      mv apache-zookeeper-${{package.version}}-bin/conf ${{targets.destdir}}/
+      mv apache-zookeeper-${{package.version}}-bin/conf ${{targets.destdir}}/usr/share/java/zookeeper
 
 subpackages:
   - name: ${{package.name}}-compat
@@ -168,8 +168,8 @@ subpackages:
 
           cp -r ${{targets.destdir}}/usr/share/java/zookeeper/bin/* /opt/iamguarded/zookeeper/bin
           ln -s /usr/share/java/zookeeper/lib /opt/iamguarded/zookeeper/lib
-          cp -r conf/* /opt/iamguarded/zookeeper/conf/
-          cp -r conf/* /opt/iamguarded/zookeeper/conf.default
+          cp -r ${{targets.destdir}}/usr/share/java/zookeeper/conf/* /opt/iamguarded/zookeeper/conf/
+          cp -r ${{targets.destdir}}/usr/share/java/zookeeper/conf/* /opt/iamguarded/zookeeper/conf.default
 
           # create symlinks for both /entrypoint.sh and /run.sh to make it compatible with iamguarded/zookeeper helm chart
           ln -sf /opt/iamguarded/scripts/zookeeper/entrypoint.sh ${{targets.contextdir}}/entrypoint.sh
@@ -207,7 +207,7 @@ test:
         cd "${ZK_HOME}"
 
         # Use sample config
-        cp /conf/zoo_sample.cfg conf/zoo.cfg
+        cp conf/zoo_sample.cfg conf/zoo.cfg
 
         # Start Zookeeper
         bin/zkServer.sh start-foreground > /dev/null 2>&1 &