diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 1f799c0..0a1df14 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -4,35 +4,48 @@ on: [push]
 jobs:
   build-backend:
     runs-on: ubuntu-latest
-    container:
-      image: gcr.io/kaniko-project/executor:debug
+    env:
+      DOCKER_HOST: tcp://localhost:2375
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Wait for Docker daemon
+        run: |
+          for i in $(seq 1 30); do
+            docker info > /dev/null 2>&1 && echo "Docker ready" && break
+            echo "Waiting for Docker... ($i)"
+            sleep 2
+          done
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          driver: docker
+          endpoint: tcp://localhost:2375
+
       - name: Build and push Backend
         run: |
-          /kaniko/executor \
-            --context=${{ gitea.workspace }}/backend \
-            --dockerfile=${{ gitea.workspace }}/backend/Dockerfile \
-            --destination=192.168.8.250:5000/chitfund-backend:latest \
-            --insecure \
-            --skip-tls-verify \
-            --label org.opencontainers.image.source=${{ gitea.repository_url }}
+          docker build -t 192.168.8.250:5000/chitfund-backend:latest ./backend
+          docker push 192.168.8.250:5000/chitfund-backend:latest
 
   build-frontend:
     runs-on: ubuntu-latest
-    container:
-      image: gcr.io/kaniko-project/executor:debug
+    env:
+      DOCKER_HOST: tcp://localhost:2375
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Wait for Docker daemon
+        run: |
+          for i in $(seq 1 30); do
+            docker info > /dev/null 2>&1 && echo "Docker ready" && break
+            echo "Waiting for Docker... ($i)"
+            sleep 2
+          done
+
       - name: Build and push Frontend
         run: |
-          /kaniko/executor \
-            --context=${{ gitea.workspace }}/luckychit \
-            --dockerfile=${{ gitea.workspace }}/luckychit/Dockerfile \
-            --destination=192.168.8.250:5000/chitfund-frontend:latest \
-            --insecure \
-            --skip-tls-verify
\ No newline at end of file
+          docker build -t 192.168.8.250:5000/chitfund-frontend:latest ./luckychit
+          docker push 192.168.8.250:5000/chitfund-frontend:latest
\ No newline at end of file