diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml
index c407bd3..65abf19 100644
--- a/.gitea/workflows/docker.yml
+++ b/.gitea/workflows/docker.yml
@@ -1,34 +1,22 @@
 name: Build and Publish Docker Image
 on: [workflow_dispatch]
 jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
-    strategy:
-      matrix:
-        arch: [amd64, arm64]
+  build-amd64:
+    runs-on: amd64-runner
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          buildkitd-flags: |
-            --allow-insecure-entitlement security.insecure
-            --allow-insecure-entitlement network.host
-      - name: Log in to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.ztsw.de
-          username: ${{ secrets.CR_USERNAME }}
-          password: ${{ secrets.CR_PASSWORD }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          platforms: linux/${{ matrix.arch }}
-          tags: git.ztsw.de/pedan/freemoto/freemoto-web:latest-${{ matrix.arch }}
-          allow: |
-            security.insecure
\ No newline at end of file
+      - name: Build AMD64
+        run: |
+          docker build -t git.ztsw.de/pedan/freemoto/freemoto-web:amd64 .
+          docker push git.ztsw.de/pedan/freemoto/freemoto-web:amd64
+  
+  build-arm64:
+    runs-on: arm64-runner
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Build ARM64
+        run: |
+          docker build -t git.ztsw.de/pedan/freemoto/freemoto-web:arm64 .
+          docker push git.ztsw.de/pedan/freemoto/freemoto-web:arm64