diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 7387ccb..17c5912 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -12,30 +12,41 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx with more CPUs
-        run: |
-          docker buildx create --use --name custom-builder \
-          --driver docker-container \
-          --driver-opt image=moby/buildkit:latest \
-          --driver-opt network=host
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
+          use: true
+          buildkitd-flags: --allow-insecure-entitlement network.host
 
-      - name: Set up QEMU
+      - name: Boost BuildKit CPU (4 cores)
+        run: |
+          CONTAINER_ID=$(docker ps --filter "name=buildx_buildkit" --format "{{.ID}}")
+          if [ -n "$CONTAINER_ID" ]; then
+            echo "Patching BuildKit container: $CONTAINER_ID with 40 CPUs"
+            docker update --cpus=40 "$CONTAINER_ID"
+            docker restart "$CONTAINER_ID"
+          else
+            echo "BuildKit container not found!"
+          fi
+
+      - name: Set up QEMU for cross-platform builds
         uses: docker/setup-qemu-action@v3
         with:
           platforms: all
 
       - name: Build and push database image (arm64 + amd64)
-        run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
-            -t docker.mistox.net/mistox-sql \
-            --push \
-            ./database
+        uses: docker/build-push-action@v5
+        with:
+          context: ./database
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: docker.mistox.net/mistox-sql:latest
 
       - name: Build and push website image (arm64 + amd64)
-        run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
-            -t docker.mistox.net/mistox-website \
-            --push \
-            .
\ No newline at end of file
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: docker.mistox.net/mistox-website:latest
\ No newline at end of file