diff --git a/.gitea/workflows/build-deploy.yml b/.gitea/workflows/build-deploy.yml
index 21f30e4..5f5946c 100644
--- a/.gitea/workflows/build-deploy.yml
+++ b/.gitea/workflows/build-deploy.yml
@@ -13,19 +13,20 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Install kubectl
+    - name: Install kubectl + Build with Kaniko + Deploy
+      # 用 bitnami/kubectl image，呢個 image 入面有 curl, bash, kubectl
+      container:
+        image: bitnami/kubectl:latest
       run: |
-        curl -LO "https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl"
-        chmod +x kubectl
-        sudo mv kubectl /usr/local/bin/kubectl
+        # ---- 下載 kubectl 前先檢查已存在版本 ----
+        kubectl version --client
 
-    - name: Build & Deploy with Kaniko (all in one)
-      run: |
-        /usr/local/bin/kubectl apply -f - <<EOJOB
+        # ---- Kaniko Job ----
+        kubectl apply -f - <<EOJOB
         apiVersion: batch/v1
         kind: Job
         metadata:
-          name: build-backend-${GITHUB_SHA:0:8}
+          name: build-backend-\${GITHUB_SHA:0:8}
           namespace: cloudforge
         spec:
           ttlSecondsAfterFinished: 600
@@ -37,7 +38,7 @@ 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:\${GITHUB_SHA:0:8}"
                 - "--destination=cloudforge-dashboard-backend:latest"
                 - "--insecure"
                 - "--skip-tls-verify"
@@ -45,10 +46,14 @@ jobs:
               restartPolicy: Never
         EOJOB
 
-        /usr/local/bin/kubectl wait --for=condition=complete --timeout=600s job/build-backend-${GITHUB_SHA:0:8} -n cloudforge
+        # ---- Wait Kaniko Build----
+        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
+        # ---- Deploy Backend ----
+        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
+        # ---- Verify Deployment ----
+        kubectl rollout status deployment/dashboard-backend -n cloudforge --timeout=300s
 
-        /usr/local/bin/kubectl delete job build-backend-${GITHUB_SHA:0:8} -n cloudforge
+        # ---- Cleanup ----
+        kubectl delete job build-backend-\${GITHUB_SHA:0:8} -n cloudforge