diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 15e87561..fe24c36e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -104,16 +104,14 @@ jobs:
             mcHelperVersion: 1.51.4-java8
         # JAVA 8: NOTE: Unable to go past 8u312 because of Forge dependencies
           - variant: java8
-            baseImage: eclipse-temurin:8u312-b07-jre-focal
+            baseImage: eclipse-temurin:8-jre
             platforms: linux/amd64,linux/arm/v7,linux/arm64
             mcVersion: 1.12.2
-            # Pin version for Java 8, also be sure to set in verify-pr.yml
             mcHelperVersion: 1.51.4-java8
           - variant: java8-jdk
-            baseImage: eclipse-temurin:8u312-b07-jdk-focal
+            baseImage: eclipse-temurin:8-jdk
             platforms: linux/amd64,linux/arm64
             mcVersion: 1.12.2
-            # Pin version for Java 8, also be sure to set in verify-pr.yml
             mcHelperVersion: 1.51.4-java8
     env:
       # Assume they line up, but when forked change to your Docker Hub username
diff --git a/.github/workflows/verify-pr.yml b/.github/workflows/verify-pr.yml
index 2dcf7765..a0a3012f 100644
--- a/.github/workflows/verify-pr.yml
+++ b/.github/workflows/verify-pr.yml
@@ -55,7 +55,8 @@ jobs:
             knockdRepoOrg: Metalcape/knock
         # JAVA 8:
           - variant: java8
-            baseImage: eclipse-temurin:8u312-b07-jre-focal
+            # make sure to track the base image version in build.yml
+            baseImage: eclipse-temurin:8-jre
             platforms: linux/amd64
             mcVersion: 1.12.2
             # For GLIBC_2.34 support
diff --git a/examples/auto-curseforge/pixelmon/docker-compose.yml b/examples/auto-curseforge/pixelmon/docker-compose.yml
index d0043e56..57c65aef 100644
--- a/examples/auto-curseforge/pixelmon/docker-compose.yml
+++ b/examples/auto-curseforge/pixelmon/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   mc:
-    image: itzg/minecraft-server:java8-multiarch
+    image: itzg/minecraft-server:java8
     ports:
       - "25565:25565"
     environment:
diff --git a/examples/rlcraft/docker-compose.yml b/examples/rlcraft/docker-compose.yml
index 48bb98a8..53137939 100644
--- a/examples/rlcraft/docker-compose.yml
+++ b/examples/rlcraft/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   mc:
-    image: itzg/minecraft-server:java8-multiarch
+    image: itzg/minecraft-server:java8
     environment:
       EULA: true
       MODPACK_PLATFORM: AUTO_CURSEFORGE
diff --git a/examples/valhelsia2/docker-compose.yml b/examples/valhelsia2/docker-compose.yml
index 21933bf6..a2be189a 100644
--- a/examples/valhelsia2/docker-compose.yml
+++ b/examples/valhelsia2/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   mc:
-    image: itzg/minecraft-server:java8-multiarch
+    image: itzg/minecraft-server:java8
     volumes:
       - data:/data
       - ./modpacks:/modpacks:ro