diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 0a1df14..9be1df8 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -10,24 +10,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Wait for Docker daemon
+      - name: Build and push Backend (Kaniko)
         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: |
-          docker build -t 192.168.8.250:5000/chitfund-backend:latest ./backend
-          docker push 192.168.8.250:5000/chitfund-backend:latest
+          docker run --rm \
+            -v $GITEA_WORKSPACE:/workspace \
+            gcr.io/kaniko-project/executor:latest \
+              --context=/workspace/backend \
+              --dockerfile=/workspace/backend/Dockerfile \
+              --destination=192.168.8.250:5000/chitfund-backend:latest \
+              --insecure \
+              --skip-tls-verify
 
   build-frontend:
     runs-on: ubuntu-latest
@@ -37,15 +29,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Wait for Docker daemon
+      - name: Build and push Frontend (Kaniko)
         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: |
-          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
+          docker run --rm \
+            -v $GITEA_WORKSPACE:/workspace \
+            gcr.io/kaniko-project/executor:latest \
+              --context=/workspace/luckychit \
+              --dockerfile=/workspace/luckychit/Dockerfile \
+              --destination=192.168.8.250:5000/chitfund-frontend:latest \
+              --insecure \
+              --skip-tls-verify
\ No newline at end of file