diff --git a/.gitea/workflows/docker-builder.yml b/.gitea/workflows/docker-builder.yml
index 713e1e0..a579155 100644
--- a/.gitea/workflows/docker-builder.yml
+++ b/.gitea/workflows/docker-builder.yml
@@ -7,9 +7,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-amd64:
-    name: Build amd64
-    runs-on: ubuntu-latest
+  build:
+    name: Build amd64 & amr64
+    runs-on: buildx-multiarch
 
     steps:
       - name: Checkout repository
@@ -33,51 +33,22 @@ jobs:
             git.pi-farm.de \
             -u ${{ secrets.REGISTRY_USER }} \
             --password-stdin
-                         
+      
+      - name: Setup buildx multiarch
+        run: |
+          docker buildx create \
+            --name multiarch \
+            --driver docker-container \
+            --use || docker buildx use multiarch
+                           
       - name: Build & push amd64
-        run: |
-          docker build \
-            -f Dockerfile \
-            --build-arg BUILD_DATE=${BUILD_DATE} \
-            --build-arg VERSION=${VERSION} \
-            -t git.pi-farm.de/pi-farm/docker-baseimage-alpine:${VERSION} .
-          docker push git.pi-farm.de/pi-farm/docker-baseimage-alpine:${VERSION}
-  
-  build-arm64:
-    name: Build arm64
-    runs-on: arm64-builder
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set image tag from branch
-        run: |
-          # hole den Branch-Namen über Git
-          VERSION=$(git rev-parse --abbrev-ref HEAD)
-
-          if [ -z "$VERSION" ]; then
-            echo "ERROR: could not determine branch name"
-            exit 1
-          fi
-          echo "VERSION=$VERSION" >> $GITEA_ENV
-          echo "BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITEA_ENV
-
-      - name: Login to registry
-        run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login \
-            git.pi-farm.de \
-            -u ${{ secrets.REGISTRY_USER }} \
-            --password-stdin
-                         
-      - name: Build & push arm64
         run: |
           docker buildx build \
-            --platform linux/arm64 \
-            -f Dockerfile.aarch64 \
+            --platform linux/arm64 linux/amd64 \
+            -f Dockerfile \
             --build-arg BUILD_DATE=${BUILD_DATE} \
             --build-arg VERSION=${VERSION} \
             -t git.pi-farm.de/pi-farm/docker-baseimage-alpine:${VERSION} \
             --push \
             .
-          #docker push git.pi-farm.de/pi-farm/docker-baseimage-alpine:${VERSION}
\ No newline at end of file
+  
\ No newline at end of file