diff --git a/.drone.yml b/.drone.yml
index 5990349..559470d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,8 +1,6 @@
 pipeline:
-  prebuild:
-    image: golang:1.9
-    environment:
-      - IMAGE=dr.dnix.de/$DRONE_REPO_NAME
+  build:
+    image: plugins/docker
     commands:
       - REV=$(git rev-list HEAD --count)
       - BUILDDATE=$(date)
@@ -23,14 +21,7 @@ pipeline:
       - echo "\"" >>$VERSIONGO
       - echo ")" >>$VERSIONGO
       - cat version.go
-  build_docker:
-    image: plugins/docker
-    environment:
-    commands:
-      - REV=$(git rev-list HEAD --count)
-      - docker build -t dr.dnix.de/mmflokati:latest
-      - docker tag dr.dnix.de/mmflokati:latest dr.dnix.de/mmflokati:${DRONE_COMMIT_BRANCH}-${REV}
-      - docker push dr.dnix.de/mmflokati:latest
+      - docker build -t dr.dnix.de/mmflokati:${DRONE_COMMIT_BRANCH}-${REV} .
       - docker push dr.dnix.de/mmflokati:${DRONE_COMMIT_BRANCH}-${REV}
   deploy:
     image: ubuntu:16.04