diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 0105955..0a14f16 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -17,19 +17,35 @@ jobs:
   build:
     needs: dockerfile_lint
     runs-on: ubuntu-22.04
+    env:
+      DOCKER_HOST: tcp://dind-docker:2375
     steps:
       - uses: actions/checkout@v4
+
       - name: Clean Branch Name
         id: clean_branch_name
         run: |
           CLEANED_BRANCH_NAME=$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' | tr '/_' '-')
           echo "CLEAN_BRANCH_NAME=${CLEANED_BRANCH_NAME}" >> $GITHUB_ENV
-      - name: Kaniko build
-        uses: aevea/action-kaniko@v0.12.0
+
+      - name: Log in to registry
+        uses: docker/login-action@v2
         with:
-          image: rogersik/monica
           registry: gitea.sikorski.cloud
-          tag: "${{ env.CLEAN_BRANCH_NAME }}"
-          cache: true
           username: rogersik
           password: ${{ secrets.REGISTRY_PASSWORD }}
+
+      - name: Build and push Docker image with Buildx
+        run: |
+          # create builder instance manually (no driver-opts)
+          docker buildx create --name mybuilder --use || true
+          docker buildx inspect --bootstrap
+
+          # build and push
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --tag gitea.sikorski.cloud/rogersik/monica:${CLEAN_BRANCH_NAME} \
+            --cache-from=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache \
+            --cache-to=type=registry,ref=gitea.sikorski.cloud/rogersik/monica:cache,mode=max \
+            --push \
+            .