diff --git a/.drone.yml b/.drone.yml
index 8c0955b..6bf52a8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -26,12 +26,13 @@ steps:
       password:
         from_secret: DOCKERHUB_PASSWORD
       repo: glenux/service-ntfy
-      tags: "latest_${DRONE_BRANCH/\//-}"
+      tags: "latest_${DRONE_COMMIT_SHA:0:8}"
+      # ${DRONE_BRANCH/\//-}"
     when:
       branch:
-        - master
-        - develop
-        - feature/*
+        - "master"
+        - "develop"
+        - "feature/*"
 
       # - name: docker
       #   image: plugins/docker