diff --git a/.drone.yml b/.drone.yml
index 67c26d5..4898991 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,35 +1,45 @@
+global-variables:
+  env: &env
+  image: golang
+    commands:
+      - go build -ldflags "-X main.version=${DRONE_TAG##v}" -o release/$GOOS/$GOARCH/ubnt-freifunk-map-api .
+      - tar -cvzf release/ubnt-freifunk-map-api_$GOOS_$GOARCH.tar.gz -C release/$GOOS/$GOARCH ubnt-freifunk-map-api
+
 kind: pipeline
 type: docker
 name: build go
 
 steps:
   - name: build linux/amd64
-    image: golang
-    commands:
-      - go build -ldflags "-X main.version=${DRONE_TAG}" -o release/linux/amd64/ubnt-freifunk-map-api .
-      - tar -cvzf release/ubnt-freifunk-map-api_linux_amd64.tar.gz -C release/linux/amd64 ubnt-freifunk-map-api
+  <<: *env
     environment:
       GOARCH: amd64
       GOOS: linux
 
   - name: build linux/arm64
-    image: golang
-    commands:
-      - go build -ldflags "-X main.version=${DRONE_TAG}" -o release/linux/arm64/ubnt-freifunk-map-api .
-      - tar -cvzf release/ubnt-freifunk-map-api_linux_arm64.tar.gz -C release/linux/arm64 ubnt-freifunk-map-api
+  <<: *env
     environment:
       GOARCH: arm64
       GOOS: linux
 
   - name: build windows
-    image: golang
-    commands:
-      - go build -ldflags "-X main.version=${DRONE_TAG}" -o release/windows/amd64/ubnt-freifunk-map-api .
-      - tar -cvzf release/ubnt-freifunk-map-api_windows_amd64.tar.gz -C release/windows/amd64 ubnt-freifunk-map-api
+  <<: *env
     environment:
       GOARCH: amd64
       GOOS: windows
 
+  - name: build macos/x64
+  <<: *env
+    environment:
+      GOARCH: amd64
+      GOOS: darwin
+
+  - name: build macos/arm64
+  <<: *env
+    environment:
+      GOARCH: arm64
+      GOOS: darwin
+
   - name: docker  
     image: plugins/docker
     settings: