diff --git a/.drone.yml b/.drone.yml
index 55325fa..bc9e121 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -29,6 +29,7 @@ steps:
   commands:
     - docker login code.jhot.me -u drone -p $PASSWORD
     - tag=$${DRONE_TAG:-$DRONE_BRANCH} # set tag to tag name (if applicable) or branch name
+    - task setup-buildx BUILDER_NAME=builder${DRONE_COMMIT_SHA}${DRONE_BUILD_NUMBER}
     - task push TAG=$tag
   when:
     event:
@@ -47,6 +48,7 @@ steps:
     path: /var/run/docker.sock
   commands:
     - docker login code.jhot.me -u drone -p $PASSWORD
+    - task setup-buildx BUILDER_NAME=builder${DRONE_COMMIT_SHA}${DRONE_BUILD_NUMBER}
     - task push TAG=main
   when:
     branch: