diff --git a/Dockerfile.kafka b/Dockerfile.kafka
index aee99d95a..62ad23a10 100644
--- a/Dockerfile.kafka
+++ b/Dockerfile.kafka
@@ -29,9 +29,12 @@ RUN --mount=type=bind,target=.,rw=true \
  && chmod a+rw "/opt/kafka-${KAFKA_VERSION}" \
  && if [ "$KAFKA_VERSION" = "4.0.0" ]; then \
        microdnf install -y java-17-openjdk-devel \
-    && git clone --depth=1 --single-branch -b 4.0 https://github.com/apache/kafka /usr/src/kafka \
+    && git clone --depth=50 --single-branch -b 4.0 https://github.com/apache/kafka /usr/src/kafka \
+    && cd /usr/src/kafka \
+    && : PIN TO COMMIT BEFORE KAFKA-17616 ZOOKEEPER REMOVAL STARTED \
+    && git reset --hard d1504649fb \
     && export JAVA_TOOL_OPTIONS=-XX:MaxRAMPercentage=80 \
-    && cd /usr/src/kafka && sed -e '/version=/s/-SNAPSHOT//' -e '/org.gradle.jvmargs/d' -e '/org.gradle.parallel/s/true/false/' -i gradle.properties && ./gradlew -PmaxParallelForks=1 -PmaxScalacThreads=1 --no-daemon releaseTarGz -x siteDocsTar -x javadoc \
+    && sed -e '/version=/s/-SNAPSHOT//' -e '/org.gradle.jvmargs/d' -e '/org.gradle.parallel/s/true/false/' -i gradle.properties && ./gradlew -PmaxParallelForks=1 -PmaxScalacThreads=1 --no-daemon releaseTarGz -x siteDocsTar -x javadoc \
     && tar xzf core/build/distributions/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz --strip-components=1 -C "/opt/kafka-${KAFKA_VERSION}" \
     && cp /tmp/server.properties "/opt/kafka-${KAFKA_VERSION}/config/" \
     && microdnf remove -y java-17-openjdk-devel \