diff --git a/.cirrus.yml b/.cirrus.yml
index 3b6ad2a7..77ff8c19 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -102,8 +102,9 @@ container_images_task: &container_images
         REG_PASSWORD: ENCRYPTED[52268944bb0d6642c33efb1c5d7fb82d0c40f9e6988448de35827f9be2cc547c1383db13e8b21516dbd7a0a69a7ae536]
     script: ci/make_container_images.sh;
     package_cache: &package_cache
-        folder: "/tmp/automation_images_tmp/.cache/**"
-        fingerprint_key: "${TARGET_NAME}-cache-version-1"
+        folder: "/tmp/cirrus-ci-build_tmp/.cache"
+        fingerprint_key: "${TARGET_NAME}-cache-version-2"
+        reupload_on_changes: true
 
 
 tooling_images_task:
@@ -127,8 +128,8 @@ tooling_images_task:
             ci/make_container_images.sh;
         done
     package_cache:
-        folder: "/tmp/automation_images_tmp/.cache/**"
-        fingerprint_key: "tooling-cache-version-1"
+        <<: *package_cache
+        fingerprint_key: "tooling-cache-version-2"
 
 
 base_images_task: