diff --git a/.drone.yml b/.drone.yml
index 80087de..94d336c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -40,9 +40,11 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-dolibarr:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-dolibarr:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-dolibarr
-      tags: "latest_${DRONE_BRANCH/\\//-}"
+      tags:
+        - "${DRONE_BRANCH/\\//-}_latest"
+        - "${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
       purge: false
     when:
       branch:
@@ -57,7 +59,7 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-dolibarr:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-dolibarr:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-dolibarr
       tags: latest
       purge: false