diff --git a/.woodpecker.yml b/.woodpecker.yml
index 3497713..10553a7 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -30,11 +30,9 @@ steps:
         cp -r .pip-cache /woodpecker/pip-cache 2>/dev/null || true
 
   - name: build-service-image
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     depends_on:
       - test
-    environment:
-      DOCKER_BUILDKIT: 1
     settings:
       username: viktorbarzin
       password:
@@ -45,17 +43,13 @@ steps:
       build_args:
         - EXTRAS=api,news,sentiment,trading,backtester
         - SERVICE_MODULE=api_gateway
-      cache_from:
-        - viktorbarzin/trading-bot-service:latest
       tags:
         - "build-${CI_PIPELINE_NUMBER}"
 
   - name: build-dashboard-image
-    image: plugins/docker
+    image: woodpeckerci/plugin-docker-buildx
     depends_on:
       - test
-    environment:
-      DOCKER_BUILDKIT: 1
     settings:
       username: viktorbarzin
       password:
@@ -65,8 +59,6 @@ steps:
       context: .
       build_args:
         - NGINX_CONF=docker/nginx-k8s.conf
-      cache_from:
-        - viktorbarzin/trading-bot-dashboard:latest
       tags:
         - "build-${CI_PIPELINE_NUMBER}"