diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index e26c26d..5f2a588 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -29,17 +29,15 @@ jobs:
           - "java13"
           - "java14"
           - "java15"
-          - "source"
-          - "source-install"
+          #- "source"
+          #- "source-install"
 
     steps:
       - name: Code Checkout
         uses: actions/checkout@v2
 
       - name: Install buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          version: latest
+        uses: docker/setup-buildx-action@v1
 
       - name: Registry Authentication
         run: |
@@ -49,11 +47,10 @@ jobs:
         env:
           IMAGE_ID: docker.pkg.github.com/${{ github.repository }}/${{ matrix.image }}:latest
         run: |
-          docker buildx build --tag $IMAGE_ID --platform linux/amd64,linux/arm64 ./${{ matrix.image }}
+          docker buildx build --tag $IMAGE_ID --platform linux/amd64 ./${{ matrix.image }}
 
       - name: Push Image
         env:
           IMAGE_ID: docker.pkg.github.com/${{ github.repository }}/${{ matrix.image }}:latest
         run: |
-          docker tag $IMAGE_ID $IMAGE_ID
           docker push $IMAGE_ID
diff --git a/alpine-install/Dockerfile b/alpine-install/Dockerfile
index 31a9d11..ac78f4a 100644
--- a/alpine-install/Dockerfile
+++ b/alpine-install/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        alpine:latest
+FROM        --platform=$BUILDPLATFORM alpine:latest
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 5d7f96c..7b2dd12 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        alpine:latest
+FROM        --platform=$BUILDPLATFORM alpine:latest
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java10/Dockerfile b/java10/Dockerfile
index ca59761..8f4712b 100644
--- a/java10/Dockerfile
+++ b/java10/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        adoptopenjdk/openjdk10-openj9:alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk10-openj9:alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java11/Dockerfile b/java11/Dockerfile
index 51457e9..a65b4b6 100644
--- a/java11/Dockerfile
+++ b/java11/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        adoptopenjdk/openjdk11-openj9:alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk11-openj9:alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java12/Dockerfile b/java12/Dockerfile
index 1c6fde9..10a248d 100644
--- a/java12/Dockerfile
+++ b/java12/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        adoptopenjdk/openjdk12-openj9:alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk12-openj9:alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java13/Dockerfile b/java13/Dockerfile
index 9a9cf19..f583802 100644
--- a/java13/Dockerfile
+++ b/java13/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        adoptopenjdk/openjdk13-openj9:alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk13-openj9:alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java14/Dockerfile b/java14/Dockerfile
index 4dd8b1d..b2302d1 100644
--- a/java14/Dockerfile
+++ b/java14/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        adoptopenjdk/openjdk14-openj9:alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk14-openj9:alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java15/Dockerfile b/java15/Dockerfile
index a0a9e9d..3c82c13 100644
--- a/java15/Dockerfile
+++ b/java15/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        adoptopenjdk/openjdk15-openj9:alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk15-openj9:alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java7/Dockerfile b/java7/Dockerfile
index 6e9bff9..568e649 100644
--- a/java7/Dockerfile
+++ b/java7/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        openjdk:7-jre-alpine
+FROM        --platform=$BUILDPLATFORM openjdk:7-jre-alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java8/Dockerfile b/java8/Dockerfile
index f9db323..f89f28e 100644
--- a/java8/Dockerfile
+++ b/java8/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        ibmjava:8-jre-alpine
+FROM        --platform=$BUILDPLATFORM ibmjava:8-jre-alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java9/Dockerfile b/java9/Dockerfile
index 8446ea9..708fd3b 100644
--- a/java9/Dockerfile
+++ b/java9/Dockerfile
@@ -5,7 +5,7 @@
 # https://github.com/matthewpi/images/blob/master/LICENSE.md
 #
 
-FROM        adoptopenjdk/openjdk9-openj9:alpine
+FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk9-openj9:alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"