diff --git a/.drone.yml b/.drone.yml
index 9fe1c91..1450259 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -36,18 +36,80 @@ pipeline:
       event: [ push, tag, pull_request ]
 
 # Build a release when tagging
-  static:
+  befor-build-static:
     image: karalabe/xgo-latest:latest
     pull: true
     environment:
       TAGS: bindata sqlite
       GOPATH: /srv/app
     commands:
-      - make release
+      - make release-dirs
+    when:
+      event: [tag, push]
+
+  build-static-windows:
+    image: karalabe/xgo-latest:latest
+    pull: true
+    group: build-static
+    environment:
+      TAGS: bindata sqlite
+      GOPATH: /srv/app
+    commands:
+      - make release-windows
+    when:
+      event: [tag, push]
+
+  build-static-linux:
+    image: karalabe/xgo-latest:latest
+    pull: true
+    group: build-static
+    environment:
+      TAGS: bindata sqlite
+      GOPATH: /srv/app
+    commands:
+      - make release-linux
+    when:
+      event: [tag, push]
+
+  build-static-darwin:
+    image: karalabe/xgo-latest:latest
+    pull: true
+    group: build-static
+    environment:
+      TAGS: bindata sqlite
+      GOPATH: /srv/app
+    commands:
+      - make release-darwin
+    when:
+      event: [tag, push]
+
+  build-static-frontend:
+    image: karalabe/xgo-latest:latest
+    pull: true
+    group: build-static
+    environment:
+      TAGS: bindata sqlite
+      GOPATH: /srv/app
+    commands:
+      - make release-frontend
+    when:
+      event: [tag, push]
+
+  after-build-static:
+    image: karalabe/xgo-latest:latest
+    pull: true
+    environment:
+      TAGS: bindata sqlite
+      GOPATH: /srv/app
+    commands:
+      - make release-copy
+      - make release-check
+      - make release-os-package
       - make release-zip
     when:
       event: [tag, push]
 
+# Push the releases to our pseudo-s3-bucket
   release:
     image: plugins/s3:1
     pull: true