diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index d24163a42..681d8046d 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -24,6 +24,7 @@ jobs:
 #          - 16j9
           - 17
           - 19
+          - 21
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-qemu-action@v2
diff --git a/java/21/Dockerfile b/java/21/Dockerfile
new file mode 100644
index 000000000..a372bffb0
--- /dev/null
+++ b/java/21/Dockerfile
@@ -0,0 +1,29 @@
+FROM        --platform=$TARGETOS/$TARGETARCH eclipse-temurin:21-jdk-jammy
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+RUN         apt update -y \
+			&& apt install -y \
+					curl \
+					lsof \
+					ca-certificates \
+					openssl \
+					git \
+					tar \
+					sqlite3 \
+					fontconfig \
+					tzdata \
+					iproute2 \
+					libfreetype6
+
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]