diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index cbdb8ce8..9860b75d 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -22,6 +22,7 @@ jobs:
         # NOTE: the "latest" variant is identified in the Docker meta step's 'latest' config
         variant:
           - java25
+          - java25-jdk
           - java25-graalvm
           - java21
           - java21-alpine
@@ -29,12 +30,10 @@ jobs:
           - java21-jdk
           - java17
           - java17-graalvm
-          - java17-alpine
           - java16
           - java11
           - java8
           - java8-graalvm-ce
-          - java8-openj9
           - java8-jdk
         include:
         # JAVA 25
@@ -42,6 +41,10 @@ jobs:
             baseImage: eclipse-temurin:25-jre
             platforms: linux/amd64,linux/arm64
             mcVersion: latest
+          - variant: java25-jdk
+            baseImage: eclipse-temurin:25
+            platforms: linux/amd64,linux/arm64
+            mcVersion: latest
           - variant: java25-graalvm
             baseImage: container-registry.oracle.com/graalvm/jdk:25-ol10
             platforms: linux/amd64,linux/arm64
@@ -73,10 +76,6 @@ jobs:
             baseImage: container-registry.oracle.com/graalvm/jdk:17-ol10
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.20.4
-          - variant: java17-alpine
-            baseImage: eclipse-temurin:17-jre-alpine
-            platforms: linux/amd64
-            mcVersion: 1.20.4
         # JAVA 16
           - variant: java16
             baseImage: adoptopenjdk:16-jre-hotspot
@@ -105,12 +104,6 @@ jobs:
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.12.2
             # Pin version for Java 8
-#            mcHelperVersion: 1.46.0
-          - variant: java8-openj9
-            baseImage: ibm-semeru-runtimes:open-8u312-b07-jre
-            platforms: linux/amd64,linux/arm64
-            mcVersion: 1.12.2
-            # Pin version for Java 8
 #            mcHelperVersion: 1.46.0
     env:
       IMAGE_TO_TEST: "${{ github.repository_owner }}/minecraft-server:test-${{ matrix.variant }}-${{ github.run_id }}"
diff --git a/docs/versions/java.md b/docs/versions/java.md
index d88841ca..680783a3 100644
--- a/docs/versions/java.md
+++ b/docs/versions/java.md
@@ -15,6 +15,7 @@ where `<tag>` refers to the first column of this table:
 | latest         | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
 | stable         | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
 | java25         | 25           | Ubuntu | Hotspot            | amd64, arm64        |      |
+| java25-jdk     | 25           | Ubuntu | Hotspot+JDK        | amd64, arm64        |      |
 | java25-graalvm | 25           | Oracle | Oracle GraalVM (3) | amd64, arm64        |      |   
 | java21         | 21           | Ubuntu | Hotspot            | amd64, arm64        |      |
 | java21-jdk     | 21           | Ubuntu | Hotspot+JDK        | amd64, arm64        |      |
@@ -22,14 +23,13 @@ where `<tag>` refers to the first column of this table:
 | java21-graalvm | 21           | Oracle | Oracle GraalVM (3) | amd64, arm64        |      |   
 | java17         | 17           | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
 | java17-graalvm | 17           | Oracle | Oracle GraalVM (3) | amd64, arm64        |      |   
-| java17-alpine  | 17           | Alpine | Hotspot            | amd64  (1)          |      |
 | java16         | 16           | Ubuntu | Hotspot            | amd64, arm64, armv7 | (4)  |
 | java11         | 11           | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
 | java8          | 8            | Ubuntu | Hotspot            | amd64, arm64, armv7 |      |
 
 Notes
 
-1. Why no arm64 for Java 17 Alpine? That is because the base images, such as [elipse-temurin](https://hub.docker.com/_/eclipse-temurin/tags?page=&page_size=&ordering=&name=17-jre-alpine) do not provide support for that. Use the Ubuntu based images instead.
+1. Why no arm64 for Java 17 Alpine? That is because the base images, such as [elipse-temurin](https://hub.docker.com/_/eclipse-temurin/tags?page=&page_size=&ordering=&name=17-jre-alpine) do not provide support for that. Use the Ubuntu-based images instead.
 2. Short-term variant, subject to deprecation upon next version introduction
 3. Based on the [Oracle GraalVM images](https://blogs.oracle.com/java/post/new-oracle-graalvm-container-images), which as of JDK 17, are now under the [GraalVM Free License](https://blogs.oracle.com/java/post/graalvm-free-license) incorporating what used to be known as the GraalVM Enterprise.
 4. This version of Java is [recommended for PaperMC 1.16.5](https://docs.papermc.io/paper/getting-started/#requirements)
@@ -134,6 +134,7 @@ The following image tags have been deprecated and are no longer receiving update
 - java16-openj9
 - java17-graalvm-ce
 - java17-openj9
+- java17-alpine
 - java19
 - java20-graalvm, java20, java20-alpine
 - java23-*
@@ -143,4 +144,4 @@ The following image tags have been deprecated and are no longer receiving update
 
 ## JSON Listing
 
-Information about the image tags is available programmatically at <https://raw.githubusercontent.com/itzg/docker-minecraft-server/refs/heads/master/images.json>
\ No newline at end of file
+Information about the image tags is available for programmatic access at <https://raw.githubusercontent.com/itzg/docker-minecraft-server/refs/heads/master/images.json>
\ No newline at end of file
diff --git a/images.json b/images.json
index 3d5aa5a8..70fe684f 100644
--- a/images.json
+++ b/images.json
@@ -97,7 +97,8 @@
     "java": "17",
     "distribution": "alpine",
     "jvm": "hotspot",
-    "architectures": ["amd64", "arm64"]
+    "architectures": ["amd64", "arm64"],
+    "deprecated": true
   },
   {
     "tag": "java17-graalvm",