diff --git a/.cirrus.yml b/.cirrus.yml
index c0c2864..5abd14f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -125,7 +125,9 @@ release_linux_x86_64_gcc_1_docker_builder:
       - "echo interrupted_ac_release_linux_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh gcc release linux x86_64 1"
@@ -197,7 +199,9 @@ release_linux_x86_64_gcc_2_docker_builder:
       - "echo interrupted_ac_release_linux_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh gcc release linux x86_64 1"
@@ -269,7 +273,9 @@ release_linux_x86_64_goeasyconfig_1_docker_builder:
       - "echo interrupted_ac_release_linux_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh goeasyconfig release linux x86_64 1"
@@ -341,7 +347,9 @@ release_linux_x86_64_ncdns_1_docker_builder:
       - "echo interrupted_ac_release_linux_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncdns release linux x86_64 1"
@@ -413,7 +421,9 @@ release_linux_x86_64_ncp11_1_docker_builder:
       - "echo interrupted_ac_release_linux_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncp11 release linux x86_64 1"
@@ -485,7 +495,9 @@ release_linux_x86_64_ncprop279_1_docker_builder:
       - "echo interrupted_ac_release_linux_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncprop279 release linux x86_64 1"
@@ -557,7 +569,9 @@ release_linux_x86_64_plain-binaries_1_docker_builder:
       - "echo interrupted_ac_release_linux_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh plain-binaries release linux x86_64 1"
@@ -629,7 +643,9 @@ release_linux_x86_64_release_nosign_docker_builder:
       - "echo interrupted_ac_release_linux_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release linux x86_64 1"
@@ -704,7 +720,9 @@ release_linux_x86_64_release_sign_docker_builder:
       - "echo interrupted_ac_release_linux_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release linux x86_64 1"
@@ -846,7 +864,9 @@ release_linux_i686_gcc_1_docker_builder:
       - "echo interrupted_ac_release_linux_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh gcc release linux i686 1"
@@ -918,7 +938,9 @@ release_linux_i686_gcc_2_docker_builder:
       - "echo interrupted_ac_release_linux_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh gcc release linux i686 1"
@@ -990,7 +1012,9 @@ release_linux_i686_goeasyconfig_1_docker_builder:
       - "echo interrupted_ac_release_linux_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh goeasyconfig release linux i686 1"
@@ -1062,7 +1086,9 @@ release_linux_i686_ncdns_1_docker_builder:
       - "echo interrupted_ac_release_linux_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncdns release linux i686 1"
@@ -1134,7 +1160,9 @@ release_linux_i686_ncp11_1_docker_builder:
       - "echo interrupted_ac_release_linux_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncp11 release linux i686 1"
@@ -1206,7 +1234,9 @@ release_linux_i686_ncprop279_1_docker_builder:
       - "echo interrupted_ac_release_linux_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncprop279 release linux i686 1"
@@ -1278,7 +1308,9 @@ release_linux_i686_plain-binaries_1_docker_builder:
       - "echo interrupted_ac_release_linux_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh plain-binaries release linux i686 1"
@@ -1350,7 +1382,9 @@ release_linux_i686_release_nosign_docker_builder:
       - "echo interrupted_ac_release_linux_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release linux i686 1"
@@ -1425,7 +1459,9 @@ release_linux_i686_release_sign_docker_builder:
       - "echo interrupted_ac_release_linux_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release linux i686 1"
@@ -1567,7 +1603,9 @@ release_windows_x86_64_mingw-w64_1_docker_builder:
       - "echo interrupted_ac_release_windows_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh mingw-w64 release windows x86_64 1"
@@ -1639,7 +1677,9 @@ release_windows_x86_64_mingw-w64_2_docker_builder:
       - "echo interrupted_ac_release_windows_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh mingw-w64 release windows x86_64 1"
@@ -1711,7 +1751,9 @@ release_windows_x86_64_goeasyconfig_1_docker_builder:
       - "echo interrupted_ac_release_windows_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh goeasyconfig release windows x86_64 1"
@@ -1783,7 +1825,9 @@ release_windows_x86_64_ncdns_1_docker_builder:
       - "echo interrupted_ac_release_windows_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncdns release windows x86_64 1"
@@ -1855,7 +1899,9 @@ release_windows_x86_64_ncp11_1_docker_builder:
       - "echo interrupted_ac_release_windows_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncp11 release windows x86_64 1"
@@ -1927,7 +1973,9 @@ release_windows_x86_64_ncprop279_1_docker_builder:
       - "echo interrupted_ac_release_windows_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncprop279 release windows x86_64 1"
@@ -1999,7 +2047,9 @@ release_windows_x86_64_plain-binaries_1_docker_builder:
       - "echo interrupted_ac_release_windows_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh plain-binaries release windows x86_64 1"
@@ -2071,7 +2121,9 @@ release_windows_x86_64_release_nosign_docker_builder:
       - "echo interrupted_ac_release_windows_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release windows x86_64 1"
@@ -2146,7 +2198,9 @@ release_windows_x86_64_release_sign_docker_builder:
       - "echo interrupted_ac_release_windows_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release windows x86_64 1"
@@ -2288,7 +2342,9 @@ release_windows_i686_mingw-w64_1_docker_builder:
       - "echo interrupted_ac_release_windows_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh mingw-w64 release windows i686 1"
@@ -2360,7 +2416,9 @@ release_windows_i686_mingw-w64_2_docker_builder:
       - "echo interrupted_ac_release_windows_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh mingw-w64 release windows i686 1"
@@ -2432,7 +2490,9 @@ release_windows_i686_goeasyconfig_1_docker_builder:
       - "echo interrupted_ac_release_windows_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh goeasyconfig release windows i686 1"
@@ -2504,7 +2564,9 @@ release_windows_i686_ncdns_1_docker_builder:
       - "echo interrupted_ac_release_windows_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncdns release windows i686 1"
@@ -2576,7 +2638,9 @@ release_windows_i686_ncp11_1_docker_builder:
       - "echo interrupted_ac_release_windows_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncp11 release windows i686 1"
@@ -2648,7 +2712,9 @@ release_windows_i686_ncprop279_1_docker_builder:
       - "echo interrupted_ac_release_windows_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncprop279 release windows i686 1"
@@ -2720,7 +2786,9 @@ release_windows_i686_plain-binaries_1_docker_builder:
       - "echo interrupted_ac_release_windows_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh plain-binaries release windows i686 1"
@@ -2792,7 +2860,9 @@ release_windows_i686_release_nosign_docker_builder:
       - "echo interrupted_ac_release_windows_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release windows i686 1"
@@ -2867,7 +2937,9 @@ release_windows_i686_release_sign_docker_builder:
       - "echo interrupted_ac_release_windows_i686"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release windows i686 1"
@@ -3009,7 +3081,9 @@ release_osx_x86_64_macosx-toolchain_1_docker_builder:
       - "echo interrupted_ac_release_osx_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh macosx-toolchain release osx x86_64 1"
@@ -3081,7 +3155,9 @@ release_osx_x86_64_macosx-toolchain_2_docker_builder:
       - "echo interrupted_ac_release_osx_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh macosx-toolchain release osx x86_64 1"
@@ -3153,7 +3229,9 @@ release_osx_x86_64_goeasyconfig_1_docker_builder:
       - "echo interrupted_ac_release_osx_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh goeasyconfig release osx x86_64 1"
@@ -3225,7 +3303,9 @@ release_osx_x86_64_ncdns_1_docker_builder:
       - "echo interrupted_ac_release_osx_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncdns release osx x86_64 1"
@@ -3297,7 +3377,9 @@ release_osx_x86_64_ncp11_1_docker_builder:
       - "echo interrupted_ac_release_osx_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncp11 release osx x86_64 1"
@@ -3369,7 +3451,9 @@ release_osx_x86_64_ncprop279_1_docker_builder:
       - "echo interrupted_ac_release_osx_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh ncprop279 release osx x86_64 1"
@@ -3441,7 +3525,9 @@ release_osx_x86_64_plain-binaries_1_docker_builder:
       - "echo interrupted_ac_release_osx_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh plain-binaries release osx x86_64 1"
@@ -3513,7 +3599,9 @@ release_osx_x86_64_release_nosign_docker_builder:
       - "echo interrupted_ac_release_osx_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release osx x86_64 1"
@@ -3588,7 +3676,9 @@ release_osx_x86_64_release_sign_docker_builder:
       - "echo interrupted_ac_release_osx_x86_64"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - "./tools/cirrus_build_project.sh release release osx x86_64 1"
diff --git a/tools/cirrus_gen_yml.sh b/tools/cirrus_gen_yml.sh
index 1497746..18413e7 100755
--- a/tools/cirrus_gen_yml.sh
+++ b/tools/cirrus_gen_yml.sh
@@ -152,7 +152,9 @@ print_os_arch () {
       - \"echo interrupted_ac_${CHANNEL}_${OS}_${ARCH}\"
     reupload_on_changes: true
   checkpoint_background_script:
-    - sleep 110m
+    # 110m caused the 2hr task timeout to be hit while the cache was uploading
+    # for macosx-toolchain, which broke subsequent builds.
+    - sleep 105m
     - ./tools/container-interrupt.sh
   build_script:
     - \"./tools/cirrus_build_project.sh ${PROJECT_BASE} ${CHANNEL} ${OS} ${ARCH} 1\""