diff --git a/.drone.yml b/.drone.yml
index 249c25f..22a589d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,9 +31,35 @@ steps:
       GOPATH: /srv/app
     commands:
       - export PATH=$PATH:$GOPATH/bin
-      - make release
+      - make release-dirs
+      - make release-windows
+      - make release-linux
+      - make release-darwin
     depends_on: [ fetch-tags ]
 
+  - name: static-deps
+    image: techknowlogick/xgo:latest
+    pull: true
+    commands:
+      - export PATH=$PATH:$GOPATH/bin
+      - make release-dirs
+      - make release-download-deps
+      - make release-electron-prepare
+    depends_on: [ fetch-tags ]
+
+  - name: after-build-static
+    image: techknowlogick/xgo:latest
+    pull: true
+    depends_on:
+      - static
+      - static-deps
+    commands:
+      - make release-copy
+      - make release-check
+      - make release-os-package
+      - release-electron-bundle
+      - make release-zip
+
   # Push the releases to our pseudo-s3-bucket
   - name: release
     image: plugins/s3:1
@@ -49,4 +75,4 @@ steps:
       strip_prefix: dist/zip/
       source: dist/zip/*
       target: /master/
-    depends_on: [ static ]
\ No newline at end of file
+    depends_on: [ after-build-static ]
\ No newline at end of file