diff --git a/.woodpecker/build-cli.yml b/.woodpecker/build-cli.yml
index 6678551f..89f0f2ff 100644
--- a/.woodpecker/build-cli.yml
+++ b/.woodpecker/build-cli.yml
@@ -26,5 +26,8 @@ steps:
       dockerfile: cli/Dockerfile
       context: cli
       auto_tag: true
-      cache_from: "registry.viktorbarzin.me:5050/infra:latest"
-      cache_to: "type=inline"
+      # cache_from/cache_to removed: registry cache corruption causes
+      # "short read: expected 32 bytes" BuildKit errors. Inline cache
+      # will be re-populated once a clean image is pushed.
+      # cache_from: "registry.viktorbarzin.me:5050/infra:latest"
+      # cache_to: "type=inline"
diff --git a/.woodpecker/default.yml b/.woodpecker/default.yml
index f367c66f..4fdea779 100644
--- a/.woodpecker/default.yml
+++ b/.woodpecker/default.yml
@@ -52,6 +52,7 @@ steps:
       - "git add stacks/ state/ .woodpecker/ || true"
       - "git remote set-url origin git@github.com:ViktorBarzin/infra.git"
       - "git commit -m 'Woodpecker CI deploy commit [CI SKIP]' || echo 'No changes'"
+      - "GIT_SSH_COMMAND='ssh -i ./secrets/deploy_key -o IdentitiesOnly=yes' git pull --rebase origin master || true"
       - "GIT_SSH_COMMAND='ssh -i ./secrets/deploy_key -o IdentitiesOnly=yes' git push origin master"
     when:
       status: [success, failure]