diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index 3a37190..bb90d16 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -19,6 +19,7 @@ jobs:
           - debian
     steps:
       - uses: actions/checkout@v2
+      - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
         with:
           version: "v0.5.1"
@@ -32,7 +33,7 @@ jobs:
         with:
           context: ./oses/${{ matrix.oses }}
           file: ./oses/${{ matrix.oses }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ghcr.io/pterodactyl/yolks:${{ matrix.oses }}
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
index b89ddd4..2c0de00 100644
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@@ -19,6 +19,7 @@ jobs:
           - debian
     steps:
       - uses: actions/checkout@v2
+      - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
         with:
           version: "v0.5.1"
@@ -32,7 +33,7 @@ jobs:
         with:
           context: ./installers
           file: ./installers/${{ matrix.tag }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ghcr.io/pterodactyl/installers:${{ matrix.tag }}
diff --git a/java/11/Dockerfile b/java/11/Dockerfile
index 26f47c8..d506437 100644
--- a/java/11/Dockerfile
+++ b/java/11/Dockerfile
@@ -28,7 +28,7 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
+ 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
  			&& useradd -d /home/container -m container
 
 USER        container
diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile
index 30c36c5..fd4a93a 100644
--- a/java/11j9/Dockerfile
+++ b/java/11j9/Dockerfile
@@ -28,7 +28,7 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
+ 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
  			&& useradd -d /home/container -m container
 
 USER        container
diff --git a/java/16/Dockerfile b/java/16/Dockerfile
index c5fa1e2..34f44a2 100644
--- a/java/16/Dockerfile
+++ b/java/16/Dockerfile
@@ -28,7 +28,7 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
+ 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
  			&& useradd -d /home/container -m container
 
 USER        container
diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile
index 2114db8..19a50cf 100644
--- a/java/16j9/Dockerfile
+++ b/java/16j9/Dockerfile
@@ -28,7 +28,7 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
+ 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
  			&& useradd -d /home/container -m container
 
 USER        container
diff --git a/java/8/Dockerfile b/java/8/Dockerfile
index b1d7875..d361ece 100644
--- a/java/8/Dockerfile
+++ b/java/8/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM openjdk:8-slim-buster
+FROM        --platform=$BUILDPLATFORM openjdk:8-slim
 
 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 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
+ 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
  			&& useradd -d /home/container -m container
 
 USER        container
diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile
index 3ab85e5..38c1015 100644
--- a/java/8j9/Dockerfile
+++ b/java/8j9/Dockerfile
@@ -28,7 +28,7 @@ LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolk
 LABEL       org.opencontainers.image.licenses=MIT
 
 RUN 		apt-get update -y \
- 			&& apt-get install -y curl ca-certificates openssl git tar sqlite fontconfig tzdata iproute2 libstdc++6 \
+ 			&& apt-get install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libstdc++6 \
  			&& useradd -d /home/container -m container
 
 USER        container
diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile
index ecf0b0f..f16188f 100644
--- a/oses/debian/Dockerfile
+++ b/oses/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=linux/amd64 debian:buster-slim
+FROM        --platform=$BUILDPLATFORM debian:buster-slim
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"