diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index dd03276dc30..e6171e15e42 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -37,7 +37,7 @@ jobs:
         # JAVA 20:
           - variant: java20
             baseImage: eclipse-temurin:20-jre
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
+            platforms: linux/amd64,linux/arm64
             mcVersion: 1.19.3
           - variant: java20-alpine
             baseImage: eclipse-temurin:20-jre-alpine
diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
index 240d7ec7702..56f3b68f5d8 100644
--- a/.github/workflows/verify-pr.yml
+++ b/.github/workflows/verify-pr.yml
@@ -24,18 +24,18 @@ jobs:
         # JAVA 20:
           - variant: java20
             baseImage: eclipse-temurin:20-jre
-            platforms: linux/amd64,linux/arm/v7,linux/arm64
-            mcVersion: 1.19.3
+            platforms: linux/amd64,linux/arm64
+            mcVersion: 1.19.4
         # JAVA 17:
           - variant: java17
             # jammy doesn't work until minecraft updates to https://github.com/netty/netty/issues/12343
             baseImage: eclipse-temurin:17-jre-focal
             platforms: linux/amd64
-            mcVersion: 1.18.2
+            mcVersion: 1.19.4
           - variant: java17-alpine
             baseImage: eclipse-temurin:17-jre-alpine
             platforms: linux/amd64
-            mcVersion: 1.18.2
+            mcVersion: 1.19.4
           - variant: java8-multiarch
             baseImage: eclipse-temurin:8u312-b07-jre-focal
             platforms: linux/amd64
@@ -53,9 +53,21 @@ jobs:
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+      - name: Confirm multi-arch build
+        uses: docker/build-push-action@v3.3.0
+        with:
+          platforms: ${{ matrix.platforms }}
+          # ensure latest base image is used
+          pull: true
+          build-args: |
+            BASE_IMAGE=${{ matrix.baseImage }}
+          cache-from: type=gha,scope=${{ matrix.variant }}
+
       - name: Build for test
         uses: docker/build-push-action@v3.3.0
         with:
+          # Only build single platform since loading multi-arch image into daemon fails with
+          # "docker exporter does not currently support exporting manifest lists"
           platforms: linux/amd64
           tags: ${{ env.IMAGE_TO_TEST }}
           # ensure latest base image is used
diff --git a/docs/versions/java.md b/docs/versions/java.md
index 56df54e68f9..8d419db2874 100644
--- a/docs/versions/java.md
+++ b/docs/versions/java.md
@@ -23,7 +23,7 @@ When using the image `itzg/minecraft-server` without a tag, the `latest` image t
 | java17-graalvm-ce | 17           | Oracle | GraalVM CE  | amd64,arm64       |
 | java17-alpine     | 17           | Alpine | Hotspot     | amd64             |
 | java20-alpine     | 19           | Alpine | Hotspot     | amd64             |
-| java20            | 19           | Ubuntu | Hotspot     | amd64,arm64,armv7 |
+| java20            | 19           | Ubuntu | Hotspot     | amd64,arm64 |
 
 For example, to use Java version 8 on any supported architecture: