diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2af0a4d..fe2131b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,7 +1,29 @@
 steps:
+  # OLD KANIKO BUILD (commented out due to TLS handshake failures with Docker Hub)
+  # build-and-push:
+  #   name: Build & Push Docker Image
+  #   image: woodpeckerci/plugin-kaniko
+  #   when:
+  #     branch: [ master, develop ]
+  #     event: [ push, pull_request, tag ]
+  #   settings:
+  #     registry: harbor.dvirlabs.com
+  #     repo: my-apps/status-api
+  #     dockerfile: Dockerfile
+  #     context: .
+  #     tags:
+  #       - latest
+  #       - ${CI_COMMIT_TAG:-${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:7}}
+  #     username:
+  #       from_secret: DOCKER_USERNAME
+  #     password:
+  #       from_secret: DOCKER_PASSWORD
+
+  # NEW DOCKER BUILDX BUILD (more reliable, handles network issues better)
   build-and-push:
     name: Build & Push Docker Image
-    image: woodpeckerci/plugin-kaniko
+    image: woodpeckerci/plugin-docker-buildx
+    privileged: true
     when:
       branch: [ master, develop ]
       event: [ push, pull_request, tag ]
@@ -17,6 +39,7 @@ steps:
         from_secret: DOCKER_USERNAME
       password:
         from_secret: DOCKER_PASSWORD
+      platforms: linux/amd64
 
   update-values:
     name: Update image tag in observability-stack