diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml
index 4e4a166..57a78a6 100644
--- a/.gitea/workflows/docker.yml
+++ b/.gitea/workflows/docker.yml
@@ -28,8 +28,14 @@ jobs:
         run: |
           REPOSITORY_LC=$(echo "${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]')
           # Build the image with the commit hash tag
-          docker build -t eiche:3000/${REPOSITORY_LC}:${GITHUB_RUN_NUMBER} .
-
+          
+          export DOCKER_CLI_EXPERIMENTAL=enabled;
+          docker buildx create --name boxitapache || true 2>/dev/null;
+          docker buildx use boxitapache;
+          docker buildx build \
+          --platform linux/arm64,linux/amd64 \
+          --tag eiche:3000/${REPOSITORY_LC}:${GITHUB_RUN_NUMBER} .
+          
           # Tag the same image as "latest"
           docker tag eiche:3000/${REPOSITORY_LC}:${GITHUB_RUN_NUMBER} eiche:3000/${REPOSITORY_LC}:latest