diff --git a/.drone.yml b/.drone.yml
index 16affbf..409e080 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,9 +23,9 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-drone-runner:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-drone-runner:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-drone-runner
-      tags: "${DRONE_COMMIT_SHA:0:8}"
+      tags: "${DRONE_BRANCH/\\//-}_${DRONE_COMMIT_SHA:0:8}"
       purge: false
 
   - name: publish:commit_branch
@@ -38,9 +38,9 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-drone-runner:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-drone-runner:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-drone-runner
-      tags: "latest_${DRONE_BRANCH/\\//-}"
+      tags: "${DRONE_BRANCH/\\//-}_latest"
       purge: false
     when:
       branch:
@@ -55,7 +55,7 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-drone-runner:latest_${DRONE_BRANCH/\\//-}"
+      cache_from: "glenux/service-drone-runner:${DRONE_BRANCH/\\//-}_latest"
       repo: glenux/service-drone-runner
       tags: latest
       purge: false