diff --git a/docker/dockerfiles/build.sh b/docker/dockerfiles/build.sh
index 96d7bf2a..e6b39832 100755
--- a/docker/dockerfiles/build.sh
+++ b/docker/dockerfiles/build.sh
@@ -32,7 +32,7 @@ cd "$(dirname "$0")"
 
 trap "{ docker buildx rm docspell-builder; }" EXIT
 
-platforms="linux/amd64,linux/aarch64,linux/arm/v7"
+platforms="linux/amd64,linux/arm64,linux/arm/v7"
 docker buildx create --name docspell-builder --use
 
 case $version in
diff --git a/docker/dockerfiles/joex.dockerfile b/docker/dockerfiles/joex.dockerfile
index 23dff9f3..830fbcd8 100644
--- a/docker/dockerfiles/joex.dockerfile
+++ b/docker/dockerfiles/joex.dockerfile
@@ -5,10 +5,9 @@ ARG joex_url=
 ARG UNO_URL=https://raw.githubusercontent.com/unoconv/unoconv/0.9.0/unoconv
 ARG TARGETPLATFORM
 
-ENV JAVA_OPTS="-Xmx1536M"
-
-RUN JDKPKG="openjdk11"; \
-    if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then JDKPKG="openjdk8"; fi; \
+RUN JDKPKG="openjdk11-jre"; \
+    if [[ $TARGETPLATFORM = linux/arm* ]]; then JDKPKG="openjdk8-jre"; fi; \
+    apk update && \
     apk add --no-cache $JDKPKG \
     tzdata \
     bash \
diff --git a/docker/dockerfiles/restserver.dockerfile b/docker/dockerfiles/restserver.dockerfile
index d51cc4a8..c40941f4 100644
--- a/docker/dockerfiles/restserver.dockerfile
+++ b/docker/dockerfiles/restserver.dockerfile
@@ -4,8 +4,9 @@ ARG version=
 ARG restserver_url=
 ARG TARGETPLATFORM
 
-RUN JDKPKG="openjdk11"; \
-    if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then JDKPKG="openjdk8"; fi; \
+RUN JDKPKG="openjdk11-jre"; \
+    if [[ $TARGETPLATFORM = linux/arm* ]]; then JDKPKG="openjdk8-jre"; fi; \
+    apk update && \
     apk add --no-cache $JDKPKG bash tzdata
 
 WORKDIR /opt