diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7c35142b..1006394ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
 - hbase: Remove 2.4.17 ([#846]).
 - omid: Remove 1.1.0 and 1.1.1 ([#846]).
 - spark: Remove 3.4.2 and 3.4.3 ([#848]).
+- zookeeper: Remove 3.8.4 ([#851]).
 
 ### Fixed
 
@@ -51,6 +52,7 @@ All notable changes to this project will be documented in this file.
 [#822]: https://github.com/stackabletech/docker-images/pull/822
 [#846]: https://github.com/stackabletech/docker-images/pull/846
 [#848]: https://github.com/stackabletech/docker-images/pull/848
+[#851]: https://github.com/stackabletech/docker-images/pull/851
 [#852]: https://github.com/stackabletech/docker-images/pull/852
 
 ## [24.7.0] - 2024-07-24
diff --git a/zookeeper/stackable/patches/3.8.4/.gitkeep b/zookeeper/stackable/patches/3.8.4/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/zookeeper/stackable/patches/3.8.4/001-cyclonedx-plugin.patch b/zookeeper/stackable/patches/3.8.4/001-cyclonedx-plugin.patch
deleted file mode 100644
index 8eef28b7d..000000000
--- a/zookeeper/stackable/patches/3.8.4/001-cyclonedx-plugin.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index d1a3066..3db20f1 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -834,7 +834,7 @@
-         <plugin>
-           <groupId>org.cyclonedx</groupId>
-           <artifactId>cyclonedx-maven-plugin</artifactId>
--          <version>2.7.6</version>
-+          <version>2.8.0</version>
-        </plugin>
-       </plugins>
-     </pluginManagement>
-@@ -1132,6 +1132,11 @@
-       <plugin>
-         <groupId>org.cyclonedx</groupId>
-         <artifactId>cyclonedx-maven-plugin</artifactId>
-+        <configuration>
-+            <projectType>application</projectType>
-+            <schemaVersion>1.5</schemaVersion>
-+            <skipNotDeployed>false</skipNotDeployed>
-+        </configuration>
-         <executions>
-           <execution>
-             <goals>
diff --git a/zookeeper/versions.py b/zookeeper/versions.py
index 8420f4ebb..c90dc3dea 100644
--- a/zookeeper/versions.py
+++ b/zookeeper/versions.py
@@ -1,13 +1,11 @@
 versions = [
-    {
-        "product": "3.8.4",
-        "java-base": "11",
-        "java-devel": "11",
-        "jmx_exporter": "1.0.1",
-    },
     {
         "product": "3.9.2",
-        "java-base": "11",
+        "java-base": "17",
+        # NOTE (@NickLarsenNZ): Builds fail on Java 17, with the output:
+        # [ERROR] Failed to execute goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs (spotbugs) on project
+        # zookeeper: Execution spotbugs of goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs failed: Java
+        # returned: 1 -> [Help 1]
         "java-devel": "11",
         "jmx_exporter": "1.0.1",
     },