diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2b969b1c..4dbeb9e66 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -177,6 +177,10 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -184,18 +188,18 @@ jobs:
           # list of Docker images to use as base name for tags
           images: |
             ${{ github.repository }}
-            ghcr.io/${{ github.repository }}
+             ghcr.io/${{ github.repository }}
           # generate Docker tags based on the following events/attributes
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha
-      - name: Log into Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+       - name: Log into Docker Hub
+         uses: docker/login-action@v2
+         with:
+           username: ${{ secrets.DOCKERHUB_USERNAME }}
+           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Log in to GitHub Docker Registry
         uses: docker/login-action@v2
         with:
@@ -211,3 +215,4 @@ jobs:
             PLANTUML_VERSION=${{ github.event.ref }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64
diff --git a/Dockerfile b/Dockerfile
index bf85afd16..2d74e5f12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,17 +10,21 @@ RUN wget \
   "https://github.com/plantuml/plantuml/releases/download/${PLANTUML_VERSION}/plantuml-${PLANTUML_VERSION#?}.jar" \
   -O /opt/plantuml.jar
 
-FROM openjdk:17-alpine
+FROM eclipse-temurin:17-jre-jammy
 
 ENV LANG en_US.UTF-8
 
-RUN apk add --no-cache \
-  graphviz \
-  ttf-dejavu
+RUN apt-get update \
+  && apt-get install --no-install-recommends -y \
+    graphviz \
+    fonts-dejavu \
+  && apt-get autoremove \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 COPY --from=loader /opt/plantuml.jar /opt/plantuml.jar
 
 WORKDIR /data
 
 ENTRYPOINT ["java", "-jar", "/opt/plantuml.jar"]
-CMD ["-version"]
\ No newline at end of file
+CMD ["-version"]