diff --git a/projects/zookeeper/DataTreeFuzzer.java b/projects/zookeeper/DataTreeFuzzer.java
new file mode 100644
index 000000000..b6c110eff
--- /dev/null
+++ b/projects/zookeeper/DataTreeFuzzer.java
@@ -0,0 +1,43 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+import org.apache.zookeeper.server.DataTree;
+import org.apache.zookeeper.ZooDefs;
+import org.apache.zookeeper.txn.TxnHeader;
+import org.apache.zookeeper.txn.CreateTxn;
+import java.util.List;
+import java.util.ArrayList;
+
+public class DataTreeFuzzer {
+  public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+    try{
+        DataTree dt = new DataTree();
+        String path = data.consumeString(20);
+        dt.createNode(path, data.consumeBytes(1000), null, data.consumeLong(), data.consumeInt(), data.consumeLong(), data.consumeLong());
+        dt.deleteNode(path, data.consumeLong());
+        dt.processTxn(
+            new TxnHeader(data.consumeInt(), data.consumeInt(), data.consumeInt(), data.consumeInt(), ZooDefs.OpCode.create), 
+            new CreateTxn(data.consumeString(15), data.consumeBytes(1000), ZooDefs.Ids.OPEN_ACL_UNSAFE, data.consumeBoolean(), data.consumeInt())
+        );
+    
+    }
+    catch (org.apache.zookeeper.KeeperException.NoNodeException e) {}
+    catch (org.apache.zookeeper.KeeperException.NodeExistsException e) {}
+    catch (java.lang.StringIndexOutOfBoundsException e) {}
+    catch (java.lang.NoClassDefFoundError e) {}
+  }
+}
\ No newline at end of file
diff --git a/projects/zookeeper/Dockerfile b/projects/zookeeper/Dockerfile
new file mode 100644
index 000000000..9903c4e3f
--- /dev/null
+++ b/projects/zookeeper/Dockerfile
@@ -0,0 +1,30 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+FROM gcr.io/oss-fuzz-base/base-builder-jvm
+
+RUN apt-get update && apt-get install -y make autoconf automake libtool wget openjdk-17-jdk
+
+RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip -o maven.zip && \
+    unzip maven.zip -d $SRC/maven && \
+    rm -rf maven.zip
+
+ENV MVN $SRC/maven/apache-maven-3.9.5/bin/mvn
+
+RUN git clone --depth 1 https://github.com/apache/zookeeper.git zookeeper
+COPY build.sh $SRC/
+COPY *.java $SRC/
+WORKDIR $SRC/zookeeper
\ No newline at end of file
diff --git a/projects/zookeeper/MessageTrackerPeekReceivedFuzzer.java b/projects/zookeeper/MessageTrackerPeekReceivedFuzzer.java
new file mode 100644
index 000000000..fd04d5613
--- /dev/null
+++ b/projects/zookeeper/MessageTrackerPeekReceivedFuzzer.java
@@ -0,0 +1,49 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+import org.apache.zookeeper.server.util.*;
+import java.io.*;
+import java.util.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+public class MessageTrackerPeekReceivedFuzzer {
+    private static final Logger LOG = LoggerFactory.getLogger(MessageTrackerPeekReceivedFuzzer.class);
+    public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+        System.setProperty(MessageTracker.MESSAGE_TRACKER_ENABLED, "true");
+        long timestamp1 = data.consumeLong();
+        MessageTracker messageTracker = new MessageTracker(data.consumeInt(1, 100));
+        String sid = data.consumeRemainingAsString();
+        messageTracker.dumpToLog(sid);
+        messageTracker.peekSent();
+        messageTracker.peekReceived();
+        messageTracker.trackSent(timestamp1);
+        messageTracker.peekSentTimestamp();
+        messageTracker.peekReceived();
+        messageTracker.dumpToLog(sid);
+        messageTracker.peekSent();
+        messageTracker.peekReceived();
+        messageTracker.trackSent(timestamp1);
+        messageTracker.trackReceived(timestamp1);
+        messageTracker.peekSentTimestamp();
+        messageTracker.peekReceivedTimestamp();
+        messageTracker.dumpToLog(sid);
+        messageTracker.peekSent();
+        messageTracker.peekReceived();
+        System.clearProperty(MessageTracker.MESSAGE_TRACKER_ENABLED);
+    }
+}
\ No newline at end of file
diff --git a/projects/zookeeper/ProcessTxnFuzzer.java b/projects/zookeeper/ProcessTxnFuzzer.java
new file mode 100644
index 000000000..cbe1681e7
--- /dev/null
+++ b/projects/zookeeper/ProcessTxnFuzzer.java
@@ -0,0 +1,38 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+import org.apache.zookeeper.server.DataTree;
+import org.apache.zookeeper.ZooDefs;
+import org.apache.zookeeper.txn.TxnHeader;
+import org.apache.zookeeper.txn.CreateTxn;
+import java.util.List;
+import java.util.ArrayList;
+
+public class ProcessTxnFuzzer {
+  public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+    try{
+        DataTree dt = new DataTree();
+        dt.processTxn(
+            new TxnHeader(data.consumeInt(), data.consumeInt(), data.consumeInt(), data.consumeInt(), ZooDefs.OpCode.create), 
+            new CreateTxn(data.consumeString(15), data.consumeBytes(1000), ZooDefs.Ids.OPEN_ACL_UNSAFE, data.consumeBoolean(), data.consumeInt())
+        );
+    
+    }
+    catch (java.lang.StringIndexOutOfBoundsException e) {}
+    catch (java.lang.NoClassDefFoundError e) {}
+  }
+}
\ No newline at end of file
diff --git a/projects/zookeeper/SerializeFuzzer.java b/projects/zookeeper/SerializeFuzzer.java
new file mode 100644
index 000000000..bcddfade3
--- /dev/null
+++ b/projects/zookeeper/SerializeFuzzer.java
@@ -0,0 +1,40 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+import org.apache.zookeeper.server.DataTree;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import org.apache.jute.BinaryInputArchive;
+import org.apache.jute.BinaryOutputArchive;
+import java.io.IOException;
+
+public class SerializeFuzzer {
+  public static void fuzzerTestOneInput(FuzzedDataProvider data) {
+    try {
+        DataTree tree = new DataTree();
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        BinaryOutputArchive oa = BinaryOutputArchive.getArchive(baos);
+        tree.serialize(oa, data.consumeString(100));
+        baos.flush();
+        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+        BinaryInputArchive ia = BinaryInputArchive.getArchive(bais);
+        tree.deserialize(ia, data.consumeString(100));
+    } catch (IOException e) {
+    }
+    
+  }
+}
\ No newline at end of file
diff --git a/projects/zookeeper/build.sh b/projects/zookeeper/build.sh
new file mode 100755
index 000000000..820a12da1
--- /dev/null
+++ b/projects/zookeeper/build.sh
@@ -0,0 +1,62 @@
+#!/bin/bash -eu
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+################################################################################
+
+export JAVA_HOME="$OUT/open-jdk-17"
+mkdir -p $JAVA_HOME
+rsync -aL --exclude=*.zip "/usr/lib/jvm/java-17-openjdk-amd64/" "$JAVA_HOME"
+
+
+MAVEN_ARGS="-Dpropguard.skip -DskipTests -Dmaven.javadoc.skip=true -Dpmd.skip=true \
+  -Dencoding=UTF-8 -Dmaven.antrun.skip=true -Dcheckstyle.skip=true \
+  -DperformRelease=True"
+$MVN clean package $MAVEN_ARGS org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade
+CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
+ -Dexpression=project.version -q -DforceStdout)
+find ./zookeeper-server -name "zookeeper-$CURRENT_VERSION.jar" -exec mv {} $OUT/zookeeper.jar \;
+
+ALL_JARS="zookeeper.jar"
+
+# The classpath at build-time includes the project jars in $OUT as well as the
+# Jazzer API.
+BUILD_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "$OUT/%s:"):$JAZZER_API_PATH
+
+# All .jar and .class files lie in the same directory as the fuzzer at runtime.
+RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_dir
+javac -cp $BUILD_CLASSPATH ${SRC}/*.java
+install ${SRC}/*.class ${OUT}/
+
+for fuzzer in $(find $SRC -name '*Fuzzer.java' -maxdepth 1); do
+  fuzzer_basename=$(basename -s .java $fuzzer)
+
+# Create an execution wrapper that executes Jazzer with the correct arguments.
+echo "#!/bin/bash
+# LLVMFuzzerTestOneInput for fuzzer detection.
+this_dir=\$(dirname \"\$0\")
+if [[ \"\$@\" =~ (^| )-runs=[0-9]+($| ) ]]; then
+  mem_settings='-Xmx1900m:-Xss900k'
+else
+  mem_settings='-Xmx2048m:-Xss1024k'
+fi
+JAVA_HOME=\"\$this_dir/open-jdk-17/\" \
+LD_LIBRARY_PATH=\"\$this_dir/open-jdk-17/lib/server\":\$this_dir \
+\$this_dir/jazzer_driver --agent_path=\$this_dir/jazzer_agent_deploy.jar \
+--cp=$RUNTIME_CLASSPATH \
+--target_class=$fuzzer_basename \
+--jvm_args=\"\$mem_settings\" \
+\$@" > $OUT/$fuzzer_basename
+  chmod u+x $OUT/$fuzzer_basename
+done
diff --git a/projects/zookeeper/project.yaml b/projects/zookeeper/project.yaml
new file mode 100644
index 000000000..c6533f1a9
--- /dev/null
+++ b/projects/zookeeper/project.yaml
@@ -0,0 +1,9 @@
+homepage: "https://github.com/apache/zookeeper"
+language: jvm
+primary_contact: "irali@google.com"
+main_repo: "https://github.com/apache/zookeeper.git"
+file_github_issue: false
+fuzzing_engines:
+  - libfuzzer
+sanitizers:
+  - address