diff --git a/.drone.yml b/.drone.yml
index 2a5da85..9e6db5a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -17,7 +17,7 @@ clone:
 
 steps:
   - name: compile
-    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
+    image: scireum/sirius-build-jdk17:latest
     commands:
       - mvn clean compile
     volumes: *scireum_volumes
@@ -26,7 +26,7 @@ steps:
       - push
 
   - name: test
-    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
+    image: scireum/sirius-build-jdk17:latest
     commands:
       - mvn clean test
     volumes: *scireum_volumes
@@ -35,7 +35,7 @@ steps:
       - pull_request
 
   - name: sonar
-    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
+    image: scireum/sirius-build-jdk17:latest
     commands:
       - "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml"
       - "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test sonar:sonar -Dsonar.projectKey=${DRONE_REPO_NAME}"
@@ -45,7 +45,7 @@ steps:
       - tag
 
   - name: package
-    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
+    image: scireum/sirius-build-jdk17:latest
     commands:
       - "sed -i 's/DEVELOPMENT-SNAPSHOT/${DRONE_TAG}/g' pom.xml"
       - mvn clean package -DskipTests
@@ -55,12 +55,15 @@ steps:
       - tag
 
   - name: publish
-    image: plugins/docker
+    image: jgescireum/buildx:latest
     settings:
       repo: scireum/s3-ninja
+      platforms:
+        - linux/amd64
+        - linux/arm64
       tags:
-        - latest
-        - "${DRONE_TAG}"
+        - scireum/s3-ninja:latest
+        - scireum/s3-ninja:"${DRONE_TAG}"
     environment:
       DOCKER_PASSWORD:
         from_secret: docker_password
@@ -72,7 +75,7 @@ steps:
         - tag
 
   - name: site
-    image: hub.scireum.com/scireum/sirius-build-jdk16:latest
+    image: scireum/sirius-build-jdk17:latest
     commands:
       - "echo \"$SSH_KEY\" > /tmp/sshkey"
       - chmod 600 /tmp/sshkey
diff --git a/Dockerfile b/Dockerfile
index 7fc71f3..ff37793 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM hub.scireum.com/scireum/sirius-runtime-jdk16:32
+FROM scireum/sirius-runtime-jdk17:48
 
 RUN mkdir /home/sirius/data && \
     mkdir /home/sirius/multipart && \