diff --git a/.woodpecker.yml b/.woodpecker.yml
index 89041e5..9998022 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,33 +1,24 @@
 # Peikarband Platform - Woodpecker CI/CD Pipeline
-# Harbor: hub.peikarband.ir
-# Project: peikarband
+# Harbor Registry: hub.peikarband.ir
+# Best Practices Applied
 
 steps:
   build-and-push:
-    image: gcr.io/kaniko-project/executor:debug
-    commands:
-      - mkdir -p /kaniko/.docker
-      - |
-        # ساخت Docker config با credentials
-        USERNAME="admin"
-        PASSWORD="5459ed7590d37656410fae38bdf59eb7ee33b68cd4c"
-        AUTH=$(echo -n "${USERNAME}:${PASSWORD}" | base64 -w 0)
-        cat > /kaniko/.docker/config.json <<EOF
-        {
-          "auths": {
-            "hub.peikarband.ir": {
-              "auth": "${AUTH}"
-            }
-          }
-        }
-        EOF
-        echo "Docker config created"
-      - /kaniko/executor
-        --dockerfile=Dockerfile
-        --context=dir://.
-        --destination=hub.peikarband.ir/peikarband/landing:latest
-        --destination=hub.peikarband.ir/peikarband/landing:${CI_COMMIT_SHA:0:8}
-        --skip-tls-verify=false
-        --verbosity=info
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      registry: hub.peikarband.ir
+      repo: hub.peikarband.ir/peikarband/landing
+      username:
+        from_secret: harbor_username
+      password:
+        from_secret: harbor_password
+      tags:
+        - latest
+        - ${CI_COMMIT_SHA:0:8}
+      dockerfile: Dockerfile
+      context: .
+      platforms: linux/amd64
+      cache: true
+      insecure: false
     when:
       event: [push, tag, manual]