diff --git a/.drone.yml b/.drone.yml
index 1927382..3e65a26 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,12 +5,14 @@ steps:
 - name: docker
   image: plugins/docker
   settings:
+    build_args:
     repo: sneak/sircd
     username:
       from_secret: docker_username
     password:
       from_secret: docker_password
-    auto_tag: true
     tags:
+      - ${DRONE_BRANCH//\//-}-${DRONE_COMMIT_SHA:0:8}
       - ${DRONE_COMMIT_SHA}
-      - ${DRONE_BRANCH}
+      - ${DRONE_BRANCH/\//-}
+      - latest