diff --git a/Dockerfile b/Dockerfile
index b13699651f4112f35f974ae05f632e970a849880..5eeaf04be4a2c29293f40cd73609142cf7a81deb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,20 @@
-FROM alpine:3.17.1 as builder
+FROM docker.io/eclipse-temurin:17-alpine as builder
 
 ENV APP_HOME="/i2p"
+ARG ANT_VERSION="1.10.15"
 
 WORKDIR /tmp/build
 COPY . .
 
-RUN apk add --virtual build-base gettext tar bzip2 apache-ant openjdk17 \
+RUN apk add --no-cache gettext tar bzip2 curl \
     && echo "build.built-by=Docker" >> override.properties \
-    && ant preppkg-linux-only \
-    && rm -rf pkg-temp/osid pkg-temp/lib/wrapper pkg-temp/lib/wrapper.* \
-    && apk del build-base gettext tar bzip2 apache-ant openjdk17
+    && curl https://dlcdn.apache.org//ant/binaries/apache-ant-${ANT_VERSION}-bin.tar.bz2 | tar -jxf - -C /opt \
+    && /opt/apache-ant-${ANT_VERSION}/bin/ant preppkg-linux-only \
+    && rm -rf pkg-temp/osid pkg-temp/lib/wrapper pkg-temp/lib/wrapper.*
 
-FROM alpine:3.17.1
+FROM docker.io/eclipse-temurin:17-jre-alpine
 ENV APP_HOME="/i2p"
 
-RUN apk add openjdk17-jre ttf-dejavu
-
 WORKDIR ${APP_HOME}
 COPY --from=builder /tmp/build/pkg-temp .