diff --git a/.drone.yml b/.drone.yml
index 7686324..2454f83 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,11 +25,11 @@
           - cat version.go
       build_docker:
         image: plugins/docker
-        environment:
         commands:
-          - REV=$(git rev-list HEAD --count)
-          - docker build -t dr.dnix.de/mmflokati:${DRONE_COMMIT_BRANCH}-${REV}
-          - docker push dr.dnix.de/mmflokati:${DRONE_COMMIT_BRANCH}-${REV}
+          - REV=$DRONE_COMMIT_BRANCH-$(git rev-list HEAD --count)
+        repo: dr.dnix.de/${DRONE_REPO_NAME}
+        tags:
+          - ${REV}
       deploy:
         image: ubuntu:16.04
         commands: