diff --git a/.gitea/workflows/build-deploy.yml b/.gitea/workflows/build-deploy.yml
index 0d6c37c..21f30e4 100644
--- a/.gitea/workflows/build-deploy.yml
+++ b/.gitea/workflows/build-deploy.yml
@@ -8,28 +8,20 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
-    
+
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    
+
     - name: Install kubectl
       run: |
         curl -LO "https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl"
         chmod +x kubectl
-        mkdir -p ~/.local/bin
-        mv kubectl ~/.local/bin/
-        export PATH=$PATH:~/.local/bin
-    
-    - name: Configure kubectl
+        sudo mv kubectl /usr/local/bin/kubectl
+
+    - name: Build & Deploy with Kaniko (all in one)
       run: |
-        # Runner 應該有 in-cluster config
-        # 或者用 service account token
-        kubectl cluster-info
-    
-    - name: Build with Kaniko
-      run: |
-        ~/.local/bin/kubectl apply -f - <<EOJOB
+        /usr/local/bin/kubectl apply -f - <<EOJOB
         apiVersion: batch/v1
         kind: Job
         metadata:
@@ -45,23 +37,18 @@ jobs:
                 args:
                 - "--dockerfile=Dockerfile"
                 - "--context=git://gitea-http.gitea.svc.cluster.local:3000/cloudforge-dev/dashboard-backend.git#main"
+                - "--destination=cloudforge-dashboard-backend:${GITHUB_SHA:0:8}"
                 - "--destination=cloudforge-dashboard-backend:latest"
                 - "--insecure"
                 - "--skip-tls-verify"
                 - "--no-push"
               restartPolicy: Never
         EOJOB
-    
-    - name: Wait and Deploy
-      run: |
-        ~/.local/bin/kubectl wait --for=condition=complete \
-          --timeout=600s \
-          job/build-backend-${GITHUB_SHA:0:8} \
-          -n cloudforge
-        
-        ~/.local/bin/kubectl set image deployment/dashboard-backend \
-          backend=cloudforge-dashboard-backend:latest \
-          -n cloudforge
-        
-        ~/.local/bin/kubectl rollout status deployment/dashboard-backend \
-          -n cloudforge
+
+        /usr/local/bin/kubectl wait --for=condition=complete --timeout=600s job/build-backend-${GITHUB_SHA:0:8} -n cloudforge
+
+        /usr/local/bin/kubectl set image deployment/dashboard-backend backend=cloudforge-dashboard-backend:${GITHUB_SHA:0:8} -n cloudforge --record
+
+        /usr/local/bin/kubectl rollout status deployment/dashboard-backend -n cloudforge --timeout=300s
+
+        /usr/local/bin/kubectl delete job build-backend-${GITHUB_SHA:0:8} -n cloudforge