diff --git a/.woodpecker/.ci.yml b/.woodpecker/.ci.yml
index 4122e57c..9820ab81 100644
--- a/.woodpecker/.ci.yml
+++ b/.woodpecker/.ci.yml
@@ -34,7 +34,7 @@ steps:
 
   # Docker builds - only on master
   docker-backend:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       registry: code.cannabrands.app
       repo: code.cannabrands.app/creationshop/dispensary-scraper
@@ -47,12 +47,14 @@ steps:
         from_secret: registry_username
       password:
         from_secret: registry_password
+      platforms: linux/amd64
+      provenance: false
     when:
       branch: master
       event: push
 
   docker-cannaiq:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       registry: code.cannabrands.app
       repo: code.cannabrands.app/creationshop/cannaiq-frontend
@@ -65,12 +67,14 @@ steps:
         from_secret: registry_username
       password:
         from_secret: registry_password
+      platforms: linux/amd64
+      provenance: false
     when:
       branch: master
       event: push
 
   docker-findadispo:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       registry: code.cannabrands.app
       repo: code.cannabrands.app/creationshop/findadispo-frontend
@@ -83,12 +87,14 @@ steps:
         from_secret: registry_username
       password:
         from_secret: registry_password
+      platforms: linux/amd64
+      provenance: false
     when:
       branch: master
       event: push
 
   docker-findagram:
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     settings:
       registry: code.cannabrands.app
       repo: code.cannabrands.app/creationshop/findagram-frontend
@@ -101,6 +107,8 @@ steps:
         from_secret: registry_username
       password:
         from_secret: registry_password
+      platforms: linux/amd64
+      provenance: false
     when:
       branch: master
       event: push
@@ -108,9 +116,14 @@ steps:
   # Deploy to Kubernetes
   deploy:
     image: bitnami/kubectl:latest
+    environment:
+      KUBECONFIG_CONTENT:
+        from_secret: kubeconfig_data
     commands:
-      - echo "$KUBECONFIG_DATA" | base64 -d > /tmp/kubeconfig
-      - export KUBECONFIG=/tmp/kubeconfig
+      - echo "Deploying to Kubernetes..."
+      - mkdir -p ~/.kube
+      - echo "$KUBECONFIG_CONTENT" | tr -d '[:space:]' | base64 -d > ~/.kube/config
+      - chmod 600 ~/.kube/config
       - kubectl set image deployment/scraper scraper=code.cannabrands.app/creationshop/dispensary-scraper:${CI_COMMIT_SHA:0:8} -n dispensary-scraper
       - kubectl set image deployment/scraper-worker scraper-worker=code.cannabrands.app/creationshop/dispensary-scraper:${CI_COMMIT_SHA:0:8} -n dispensary-scraper
       - kubectl set image deployment/cannaiq-frontend cannaiq-frontend=code.cannabrands.app/creationshop/cannaiq-frontend:${CI_COMMIT_SHA:0:8} -n dispensary-scraper
@@ -121,7 +134,7 @@ steps:
       - kubectl rollout status deployment/cannaiq-frontend -n dispensary-scraper --timeout=120s
       - kubectl rollout status deployment/findadispo-frontend -n dispensary-scraper --timeout=120s
       - kubectl rollout status deployment/findagram-frontend -n dispensary-scraper --timeout=120s
-    secrets: [kubeconfig_data]
+      - echo "All deployments complete!"
     when:
       branch: master
       event: push