diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index f03f895..a8ad037 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -15,12 +15,12 @@ jobs:
       fail-fast: false
       matrix:
         tag:
-          - 7
           - 8
-          - 9
+          - 8j9
           - 11
-          - 14
+          - 11j9
           - 16
+          - 16j9
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-buildx-action@v1
diff --git a/java/11/Dockerfile b/java/11/Dockerfile
index f041c8d..ce33f29 100644
--- a/java/11/Dockerfile
+++ b/java/11/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk11:debianslim-jre
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk11:alpine-jre
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java/9/Dockerfile b/java/11j9/Dockerfile
similarity index 95%
rename from java/9/Dockerfile
rename to java/11j9/Dockerfile
index ba6b33d..a566bfa 100644
--- a/java/9/Dockerfile
+++ b/java/11j9/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk9:debianslim-jre
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:alpine-jre
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java/16/Dockerfile b/java/16/Dockerfile
index f4f8d58..88a6f1e 100644
--- a/java/16/Dockerfile
+++ b/java/16/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk16:debianslim-jre
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk16:alpine-jre
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java/7/Dockerfile b/java/16j9/Dockerfile
similarity index 92%
rename from java/7/Dockerfile
rename to java/16j9/Dockerfile
index f9ac53d..3e9bca8 100644
--- a/java/7/Dockerfile
+++ b/java/16j9/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM openjdk:7-jre-alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk16-openj9:alpine-jre
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
@@ -28,7 +28,7 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN         apk add --update --no-cache ca-certificates curl fontconfig git openssl sqlite tar tzdata \
-				&& adduser -D -h /home/container container
+			    && adduser -D -h /home/container container
 
 USER        container
 ENV         USER=container HOME=/home/container
diff --git a/java/8/Dockerfile b/java/8/Dockerfile
index 78a93fc..ca967be 100644
--- a/java/8/Dockerfile
+++ b/java/8/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM ibmjava:8-jre-alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk8:alpine-jre
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java/14/Dockerfile b/java/8j9/Dockerfile
similarity index 95%
rename from java/14/Dockerfile
rename to java/8j9/Dockerfile
index d44c8e8..4b7be91 100644
--- a/java/14/Dockerfile
+++ b/java/8j9/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk14:debianslim-jre
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk8-openj9:alpine-jre
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"