diff --git a/.drone.yml b/.drone.yml
index e49df6b..de7c8bb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -8,6 +8,7 @@
           - BUILDDATE=$(date)
           - BRANCH=$DRONE_COMMIT_BRANCH
           - VERSIONGO=version.go
+          - TAGS=.tags
           - echo "Building image $IMAGE:$BRANCH-$REV"
           - echo  "package main" >$VERSIONGO
           - echo "" >>$VERSIONGO
@@ -22,14 +23,13 @@
           - echo -n "$BUILDDATE" >>$VERSIONGO
           - echo "\"" >>$VERSIONGO
           - echo ")" >>$VERSIONGO
-          - cat version.go
+          - cat $VERSIONGO
+          - echo -n "$BRANCH-$REV" >$TAGS
+          - cat $TAGS
       build_docker:
         image: plugins/docker
-        environment:
-          - REV=$DRONE_COMMIT_BRANCH-$(git rev-list HEAD --count)
         repo: dr.dnix.de/${DRONE_REPO_NAME}
         tags:
-          - $DRONE_COMMIT_BRANCH-$(git rev-list HEAD --count)
           - latest
       deploy:
         image: ubuntu:16.04