diff --git a/.drone.yml b/.drone.yml
index 84455ef..75c7060 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -33,15 +33,34 @@ kind: pipeline
 name: publish
 
 steps:
+- name: tag
+  image: alpine
+  steps:
+  - echo "$DRONE_COMMIT_SHA,latest" > .tags
+  when:
+
+
+- name: tag-release
+  image: alpine
+  steps:
+  - echo "$DRONE_TAG" > .tags
+  when:
+    event:
+      exclude:
+      - tag
+
 - name: docker
   image: plugins/docker
   settings:
-    auto_tag: true
+    auto_tag: false
     username:
       from_secret: DOCKER_USERNAME
     password:
       from_secret: DOCKER_PASSWORD
     repo: shouptech/humulus
+  when:
+    event:
+    - tag
 
 depends_on:
 - test