diff --git a/.drone.yml b/.drone.yml
index c24ca4a..b4f0b25 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -48,10 +48,10 @@ volumes:
 
 ---
 kind: pipeline
-name: docker
+name: docker-kubersd
 
 steps:
-- name: kubersd
+- name: image
   image: plugins/docker
   environment:
     VERSION: "${DRONE_SEMVER_SHORT}"
@@ -68,10 +68,17 @@ steps:
   when:
     event: tag
 
-- name: kubers-agent
+depends_on:
+  - default
+
+---
+  
+kind: pipeline
+name: docker-kubers-agent
+- name: image
   image: plugins/docker
   environment:
-    VERSION: "${DRONE_SEMVER_SHORT}"  
+    VERSION: "${DRONE_SEMVER_SHORT}"
   settings:
     repo: jacops/kubers-agent
     auto_tag: true
diff --git a/cmd/kubers-agent/release.Dockerfile b/cmd/kubers-agent/release.Dockerfile
index c31011f..9f366ca 100644
--- a/cmd/kubers-agent/release.Dockerfile
+++ b/cmd/kubers-agent/release.Dockerfile
@@ -22,10 +22,10 @@ RUN set -ex && \
     "${USER}"
 
 RUN set -ex && \
-    wget https://github.com/jacops/kubers/releases/download/v${VERSION#?}/kubers_${VERSION#?}_Linux_x86_64.tar.gz
+    wget https://github.com/jacops/kubers/releases/download/v${VERSION}/kubers_${VERSION}_Linux_x86_64.tar.gz
 
 RUN set -ex && \
-    tar -xvf kubers_${VERSION#?}_Linux_x86_64.tar.gz
+    tar -xvf kubers_${VERSION}_Linux_x86_64.tar.gz
 
 FROM scratch
 
diff --git a/cmd/kubersd/release.Dockerfile b/cmd/kubersd/release.Dockerfile
index 8896e7d..caaeb92 100644
--- a/cmd/kubersd/release.Dockerfile
+++ b/cmd/kubersd/release.Dockerfile
@@ -22,10 +22,10 @@ RUN set -ex && \
     "${USER}"
 
 RUN set -ex && \
-    wget https://github.com/jacops/kubers/releases/download/v${VERSION#?}/kubers_${VERSION#?}_Linux_x86_64.tar.gz
+    wget https://github.com/jacops/kubers/releases/download/v${VERSION}/kubers_${VERSION}_Linux_x86_64.tar.gz
 
 RUN set -ex && \
-    tar -xvf kubers_${VERSION#?}_Linux_x86_64.tar.gz
+    tar -xvf kubers_${VERSION}_Linux_x86_64.tar.gz
 
 FROM scratch