diff --git a/.drone.yml b/.drone.yml
index 22d4b22..0ac15a2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -41,7 +41,9 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}"
+      cache_from:
+        - "glenux/service-nextcloud:${DRONE_COMMIT_SHA:0:8}"
+        - "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}"
       repo: glenux/service-nextcloud
       tags: "latest_${DRONE_BRANCH/\\//-}"
       purge: false
@@ -60,7 +62,9 @@ steps:
         from_secret: DOCKERHUB_USERNAME
       password:
         from_secret: DOCKERHUB_PASSWORD
-      cache_from: "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}"
+      cache_from:
+        - "glenux/service-nextcloud:${DRONE_COMMIT_SHA:0:8}"
+        - "glenux/service-nextcloud:latest_${DRONE_BRANCH/\\//-}"
       repo: glenux/service-nextcloud
       tags: latest
       purge: false