diff --git a/.cirrus.yml b/.cirrus.yml
index 32ae3f32c8..90fdccbadd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -435,7 +435,7 @@ docker_build_template: &DOCKER_BUILD_TEMPLATE
   always:
     ccache_cache:
       folder: /tmp/ccache
-      fingerprint_script: echo ccache-$CIRRUS_TASK_NAME-$CIRRUS_OS
+      fingerprint_script: echo ccache-$ZEEK_CCACHE_EPOCH-$CIRRUS_TASK_NAME-$CIRRUS_OS
       reupload_on_changes: true
 
     builder_image_cache:
@@ -457,10 +457,18 @@ docker_build_template: &DOCKER_BUILD_TEMPLATE
     - if [ -f ${BUILDER_IMAGE_CACHE_DIR}/final.zst ]; then zstd -d < ${BUILDER_IMAGE_CACHE_DIR}/final.zst | docker load; fi
     - cd docker && docker build --cache-from zeek-builder:latest -t zeek-builder:latest -f builder.Dockerfile .
     - docker save zeek-builder:latest | zstd > ${BUILDER_IMAGE_CACHE_DIR}/builder.zst
-  build_zeek_script:
-    - docker run --name zeek-builder-container -e CCACHE_DIR=/tmp/ccache -e CCACHE_NOSTATS=1 -v $(pwd):/src/zeek -v/tmp/ccache:/tmp/ccache -w /src/zeek zeek-builder:latest bash -c "./configure $ZEEK_CONFIGURE_FLAGS && ninja -C build install"
+  build_zeek_script: |
+    set -x
+    docker run --name zeek-builder-container \
+        -e CCACHE_MAXSIZE=$CCACHE_MAXSIZE \
+        -e CCACHE_MAXFILES=$CCACHE_MAXFILES \
+        -e CCACHE_DIR=/tmp/ccache \
+        -e CCACHE_NOSTATS=1 \
+        -v $(pwd):/src/zeek -v/tmp/ccache:/tmp/ccache -w /src/zeek zeek-builder:latest \
+        bash -c "./configure $ZEEK_CONFIGURE_FLAGS && ninja -C build install"
+
     # The "zeek-build" tag is used within final.Dockerfile using COPY --from=...
-    - docker commit zeek-builder-container zeek-build
+    docker commit zeek-builder-container zeek-build
   build_final_script:
     - cd docker && docker build --cache-from ${IMAGE_TAG} -t ${IMAGE_TAG} -f final.Dockerfile .
     - docker save ${IMAGE_TAG} | zstd > ${ZEEK_IMAGE_CACHE_DIR}/final.zst