diff --git a/.drone.yml b/.drone.yml
index d181b45..9f0f43b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -49,8 +49,10 @@ steps:
         from_secret: docker_password
     commands:
       - sleep 5 # give docker enough time to start
-      - echo $DOCKER_PASSWORD | docker login --username $DOCKER_USER --password-stdin registry.riba-interactive.de
-      - DOCKER_BUILDKIT=1 docker build -t registry.riba-interactive.de/conventi:$DRONE_TAG .
+      - echo "$DOCKER_PASSWORD" | docker login --username $DOCKER_USER --password-stdin registry.riba-interactive.de
+      - docker pull registry.riba-interactive.de/conventi:latest || true
+      - DOCKER_BUILDKIT=1 docker build --cache-from registry.riba-interactive.de/conventi:latest --tag registry.riba-interactive.de/conventi:latest  .
+      - docker tag registry.riba-interactive.de/conventi:latest registry.riba-interactive.de/conventi:$DRONE_TAG
       - docker push --all-tags registry.riba-interactive.de/conventi
 
 trigger:
@@ -90,7 +92,9 @@ steps:
     commands:
       - sleep 5 # give docker enough time to start
       - echo "$DOCKER_PASSWORD" | docker login --username $DOCKER_USER --password-stdin registry.riba-interactive.de
-      - DOCKER_BUILDKIT=1 docker build --tag registry.riba-interactive.de/conventi:$DRONE_BUILD_NUMBER .
+      - docker pull registry.riba-interactive.de/conventi:latest || true
+      - DOCKER_BUILDKIT=1 docker build --cache-from registry.riba-interactive.de/conventi:latest --tag registry.riba-interactive.de/conventi:latest  .
+      - docker tag registry.riba-interactive.de/conventi:latest registry.riba-interactive.de/conventi:build-$DRONE_BUILD_NUMBER
       - docker push --all-tags registry.riba-interactive.de/conventi
 
 trigger: