Ok, I think this is a good tag strategy...

.drone.yml

@@ -33,28 +33,33 @@ kind: pipeline
 name: publish
 
 steps:
-- name: tag
-  image: alpine
-  steps:
-  - echo "$DRONE_COMMIT_SHA,latest" > .tags
-
-- name: tag-release
-  image: alpine
-  steps:
-  - echo "$DRONE_TAG" > .tags
-  when:
-    event:
-      - tag
-
 - name: docker
   image: plugins/docker
   settings:
-    auto_tag: false
     username:
       from_secret: DOCKER_USERNAME
     password:
       from_secret: DOCKER_PASSWORD
     repo: shouptech/humulus
+    tags:
+    - latest
+  when:
+    branch:
+    - master
+
+- name: docker
+  image: plugins/docker
+  settings:
+    username:
+      from_secret: DOCKER_USERNAME
+    password:
+      from_secret: DOCKER_PASSWORD
+    repo: shouptech/humulus
+    tags:
+    - ${DRONE_TAG}
+  when:
+    event:
+    - tag
 
 depends_on:
 - test