diff --git a/.drone.yml b/.drone.yml
index 0c2383c..76c7b16 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,6 +9,7 @@ clone:
   disable: true
 
 steps:
+
 - name: Clone skopeo source repository
   image: bv11-cr01.bessems.eu/proxy/alpine/git
   commands:
@@ -17,6 +18,7 @@ steps:
   when:
     status:
     - success
+
 - name: Build binary (Linux)
   depends_on:
     - Clone skopeo source repository
@@ -28,16 +30,9 @@ steps:
       BUILDTAGS=containers_image_openpgp \
       GO_DYN_FLAGS=
   - bin/skopeo --version
-  - |
-    curl \
-      --header "Authorization: token $GIT_APIKEY" \
-      --upload-file bin/skopeo \
-      https://code.spamasaurus.com/api/packages/$GIT_USERNAME/generic/skopeo/$SKOPEO_VERSION/skopeo
   environment:
     CGO_ENABLED: 0
-    GIT_APIKEY:
-      from_secret: git_apikey
-    GIT_USERNAME: djpbessems
+
 - name: Build binary (Windows)
   depends_on:
     - Clone skopeo source repository
@@ -49,15 +44,26 @@ steps:
       BUILDTAGS=containers_image_openpgp \
       GO_DYN_FLAGS= \
       bin/skopeo.windows.amd64.exe
-  - ls bin
-  # - bin/skopeo --version
-  # - |
-  #   curl \
-  #     --header "Authorization: token $GIT_APIKEY" \
-  #     --upload-file bin/skopeo \
-  #     https://code.spamasaurus.com/api/packages/$GIT_USERNAME/generic/skopeo/$SKOPEO_VERSION/skopeo
   environment:
     CGO_ENABLED: 0
+
+- name: Upload binaries
+  depends_on:
+    - Build binary (Linux)
+    - Build binary (Windows)
+  image: bv11-cr01.bessems.eu/proxy/library/golang
+  commands:
+  - |
+    curl \
+      --header "Authorization: token $GIT_APIKEY" \
+      --upload-file bin/skopeo_linux_amd64 \
+      https://code.spamasaurus.com/api/packages/$GIT_USERNAME/generic/skopeo/$SKOPEO_VERSION/skopeo
+  - |
+    curl \
+      --header "Authorization: token $GIT_APIKEY" \
+      --upload-file bin/skopeo_windows_amd64.exe \
+      https://code.spamasaurus.com/api/packages/$GIT_USERNAME/generic/skopeo/$SKOPEO_VERSION/skopeo
+  environment:
     GIT_APIKEY:
       from_secret: git_apikey
     GIT_USERNAME: djpbessems