diff --git a/.drone.yml b/.drone.yml
index 29c691c..7326a03 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,88 +1,71 @@
 ---
 kind: pipeline
 type: docker
-name: build-linux-amd64
-
-environment:
-  GOOS: linux
-  GOARCH: amd64
-  GOOPTIONS: -mod=vendor
-  SRCFILES: cmd/go-aptproxy/*.go
-  PROJECTNAME: go-aptproxy
+name: build-linux
 
 steps:
-  - name: build
+  - name: build-linux-amd64
     image: golang
-    environment:
-      VERSION: dev
     commands:
-      - go generate $SRCFILES
       - go build -o $PROJECTNAME $GOOPTIONS $SRCFILES
-    when:
-      event:
-        exclude:
-          - tag
-
----
-kind: pipeline
-type: docker
-name: build-linux-arm64
-
-environment:
-  GOOS: linux
-  GOARCH: arm64
-  GOOPTIONS: -mod=vendor
-  SRCFILES: cmd/go-aptproxy/*.go
-  PROJECTNAME: go-aptproxy
-
-steps:
-  - name: build
-    image: golang
-    environment:
-      VERSION: dev
-    commands:
-      - go generate $SRCFILES
-      - go build -o $PROJECTNAME $GOOPTIONS $SRCFILES
-    when:
-      event:
-        exclude:
-          - tag
-
----
-kind: pipeline
-type: docker
-name: gitea-release
-
-environment:
-  GOOS: linux
-  GOOPTIONS: -mod=vendor
-  SRCFILES: cmd/go-aptproxy/*.go
-  PROJECTNAME: go-aptproxy
-
-steps:
-  - name: build-amd64
-    image: golang
     environment:
+      GOOS: linux
       GOARCH: amd64
+      GOOPTIONS: -mod=vendor
+      SRCFILES: cmd/go-aptproxy/*.go
+      PROJECTNAME: go-aptproxy
+    when:
+      event:
+        exclude:
+          - tag
+  - name: build-linux-arm64
+    image: golang
+    commands:
+      - go build -o $PROJECTNAME $GOOPTIONS $SRCFILES
+    environment:
+      GOOS: linux
+      GOARCH: arm64
+      GOOPTIONS: -mod=vendor
+      SRCFILES: cmd/go-aptproxy/*.go
+      PROJECTNAME: go-aptproxy
+    when:
+      event:
+        exclude:
+          - tag
+
+---
+kind: pipeline
+type: docker
+name: gitea-release-linux
+
+steps:
+  - name: build-linux-amd64
+    image: golang
     commands:
-      - export VERSION=$DRONE_TAG
-      - go generate $SRCFILES
       - go build -o $PROJECTNAME $GOOPTIONS $SRCFILES
       - tar -czvf $PROJECTNAME-$DRONE_TAG-$GOOS-$GOARCH.tar.gz $PROJECTNAME
       - echo $PROJECTNAME $DRONE_TAG > VERSION
+    environment:
+      GOOS: linux
+      GOARCH: amd64
+      GOOPTIONS: -mod=vendor
+      SRCFILES: cmd/go-aptproxy/*.go
+      PROJECTNAME: go-aptproxy
     when:
       event:
         - tag
-  - name: build-arm64
+  - name: build-linux-arm64
     image: golang
-    environment:
-      GOARCH: arm64
     commands:
-      - export VERSION=$DRONE_TAG
-      - go generate $SRCFILES
       - go build -o $PROJECTNAME $GOOPTIONS $SRCFILES
       - tar -czvf $PROJECTNAME-$DRONE_TAG-$GOOS-$GOARCH.tar.gz $PROJECTNAME
       - echo $PROJECTNAME $DRONE_TAG > VERSION
+    environment:
+      GOOS: linux
+      GOARCH: arm64
+      GOOPTIONS: -mod=vendor
+      SRCFILES: cmd/go-aptproxy/*.go
+      PROJECTNAME: go-aptproxy
     when:
       event:
         - tag