diff --git a/.drone.yml b/.drone.yml
index 4fce852..926414a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -23,12 +23,12 @@ steps:
 - name: publish
   # image: plugins/docker
   image: registry.sn48.zivili.ch/library/plugins-docker:24.0.0
+  # CRITICAL: Enable BuildKit at step environment level (not build_args!)
   environment:
-    # Enable BuildKit for cache mounts and inline cache
     DOCKER_BUILDKIT: "1"
   settings:
     build_args:
-      # Enable inline cache in built image
+      # Enable inline cache export to registry
       - BUILDKIT_INLINE_CACHE=1
     dockerfile: Dockerfile
     context: .
@@ -37,8 +37,6 @@ steps:
     tags:
       - "amd64-1.0.0"
       - "latest"
-    cache_from:
-      - "registry.sn48.zivili.ch/meow/playchoo-auth:latest"
     username:
       from_secret: PORTUS_USER
     password:
@@ -46,6 +44,10 @@ steps:
     debug: true
     launch_debug: true
     force_tag: true
+    # Pull cache from registry images
+    cache_from:
+      - "registry.sn48.zivili.ch/meow/playchoo-auth:latest"
+      - "registry.sn48.zivili.ch/meow/playchoo-auth:amd64-1.0.0"
   when:
     event:
       - push