diff --git a/.drone.yml b/.drone.yml
index efde576..4c21b8e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,26 +12,6 @@ steps:
       - 'echo "Repository: glenux/docmachine"'
       - 'echo "Git commit: ${DRONE_COMMIT_SHA:0:8}"'
 
-  - name: publish:commit_sha
-    image: plugins/docker
-    # pull: never
-    # volumes:
-    #   - name: cache
-    #     path: /stupid
-    environment:
-      DOCKER_REPO: glenux/docmachine
-    settings:
-      username:
-        from_secret: DOCKERHUB_USERNAME
-      password:
-        from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/docmachine:latest_${DRONE_BRANCH/\\//-}"
-      context: .
-      dockerfile: docker/Dockerfile
-      repo: glenux/docmachine
-      tags: "${DRONE_COMMIT_SHA:0:8}"
-      purge: false
-
   - name: publish:commit_branch
     image: plugins/docker
     # volumes:
@@ -46,7 +26,9 @@ steps:
       context: .
       dockerfile: docker/Dockerfile
       repo: glenux/docmachine
-      tags: "latest_${DRONE_BRANCH/\\//-}"
+      tags:
+        - "latest_${DRONE_BRANCH/\\//-}"
+        - "${DRONE_COMMIT_SHA:0:8}"
       purge: false
     when:
       branch: