diff --git a/.drone.yml b/.drone.yml
index 09b712e..daab09c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,10 +11,12 @@ steps:
   image: alexviscreanu/buildx
   commands:
     - docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
-    - docker buildx create --use --name crosscomp
+    - export BUILDER_ID="crosscomp-$(cat /proc/self/cgroup | head -1 | cut -d '/' -f 3)"
+    - docker buildx create --use --name $BUILDER_ID
     - docker buildx inspect --bootstrap
     - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD registry.chrz.de
     - docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --output=type=image,push=true --progress tty -t registry.chrz.de/public/hello-ci .
+    - docker buildx rm $BUILDER_ID
   volumes:
     - name: docker_socket
       path: /var/run/docker.sock