diff --git a/.drone.yml b/.drone.yml
index 534660d..57c1ef3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -27,21 +27,26 @@ platform:
   arch: amd64
 
 steps:
-- name: dryrun
-  image: plugins/docker:19
-  settings:
-    dockerfile: Dockerfile
-    dry_run: true
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
+- name: wait-for
+  image: thegeeklab/wait-for
+  commands:
+  - wait-for dind:2376
   environment:
-    DOCKER_BUILDKIT: 1
+    WAITFOR_TIMEOUT: 60
+
+- name: dryrun
+  image: jdrouet/docker-with-buildx:stable
+  commands:
+  - docker buildx create --use
+  - docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag thegeeklab/buildx-alpine:latest .
+  volumes:
+  - name: dockersock
+    path: /var/run
   when:
     ref:
     - refs/pull/**
+  depends_on:
+  - wait-for
 
 - name: tags
   image: thegeeklab/docker-autotag
@@ -54,35 +59,23 @@ steps:
     ref:
     - refs/heads/main
     - refs/tags/**
+  depends_on:
+  - wait-for
 
 - name: publish-dockerhub
-  image: plugins/docker:19
-  settings:
-    dockerfile: Dockerfile
-    password:
-      from_secret: docker_password
-    repo: thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: docker_username
+  image: jdrouet/docker-with-buildx:stable
+  commands:
+  - docker login -u "$$DOCKER_USERNAME" -p "$$DOCKER_PASSWORD"
+  - docker buildx create --use
+  - docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --tag thegeeklab/buildx-alpine:latest .
   environment:
-    DOCKER_BUILDKIT: 1
-  when:
-    ref:
-    - refs/heads/main
-    - refs/tags/**
-  depends_on:
-  - tags
-
-- name: publish-quay
-  image: plugins/docker:19
-  settings:
-    dockerfile: Dockerfile
-    password:
-      from_secret: quay_password
-    registry: quay.io
-    repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
-    username:
-      from_secret: quay_username
+    DOCKER_PASSWORD:
+      from_secret: docker_password
+    DOCKER_USERNAME:
+      from_secret: docker_username
+  volumes:
+  - name: dockersock
+    path: /var/run
   when:
     ref:
     - refs/heads/main
@@ -104,7 +97,18 @@ steps:
     - refs/tags/**
   depends_on:
   - publish-dockerhub
-  - publish-quay
+
+services:
+- name: dind
+  image: docker:dind
+  privileged: true
+  volumes:
+  - name: dockersock
+    path: /var/run
+
+volumes:
+- name: dockersock
+  temp: {}
 
 trigger:
   ref:
@@ -181,6 +185,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 14eb650adf452610ccb668009fadc51bbd44f9cede6a037ae2c4430c72458b5e
+hmac: fbe5a3e4d5b43aa5074eb9b614cab44043517e5747288eadf7621db6650da6de
 
 ...