diff --git a/.drone.yml b/.drone.yml
index 16c16e2..4e845bb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 ---
 kind: pipeline
-type: exec
+type: docker
 name: default
 
 environment:
@@ -8,25 +8,40 @@ environment:
 
 platform:
   os: linux
-  arch: arm64
+  arch: amd64
+
+services:
+  - name: dind
+    image: docker:dind
+    command: ["dockerd", "--experimental"]
+    privileged: true
+    volumes:
+      - name: docker_socket
+        path: /var/run
+
+volumes:
+  - name: docker_socket
+    temp: {}
 
 steps:
   - name: build
+    image: docker:latest
     commands:
       - |-
         case $(uname -a) in
           *x86_64*)
-            ARCH="amd64"
+            export ARCH="amd64"
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
             ;;
           *aarch64*)
-            ARCH="arm64"
+            export ARCH="arm64"
             ;;
           *)
-            ARCH="unknown"
+            export ARCH="unknown"
             ;;
           esac
       - |-
-        BUILDX_URL=$( \
+        export BUILDX_URL=$( \
           wget -q -O - \
             https://api.github.com/repos/docker/buildx/releases/latest \
             | grep "browser_download_url.*linux-$ARCH" \
@@ -42,7 +57,6 @@ steps:
         echo -n $REGISTRY_PASS \
           | docker login -u $REGISTRY_USER --password-stdin $REGISTRY_HOST
       - docker buildx create --name multiarch --use
-      - export DRONE_TAG=br-1.5.2
       - |-
         docker buildx build \
           --platform linux/amd64,linux/arm64 \
@@ -52,7 +66,9 @@ steps:
           -t $REGISTRY_HOST/$IMAGE:$DRONE_TAG \
           -t $REGISTRY_HOST/$IMAGE:latest \
           .
-
+    volumes:
+      - name: docker_socket
+        path: /var/run
     environment:
       IMAGE: protonmail-bridge
       REGISTRY_HOST: registry.thegibsonhome.net
@@ -61,6 +77,6 @@ steps:
       REGISTRY_PASS:
         from_secret: registry_password
 
-#trigger:
-#  event:
-#    - tag
+trigger:
+  event:
+    - tag