diff --git a/.cirrus.yml b/.cirrus.yml
index 55ae4894ba..f93b7f1f79 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -178,14 +178,14 @@ ubuntu16_task:
 # Apple doesn't publish official long-term support timelines.
 # We aim to support both the current and previous macOS release.
 macos_big_sur_task:
-  osx_instance:
+  macos_instance:
     image: big-sur-base
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
   << : *MACOS_RESOURCES_TEMPLATE
 
 macos_catalina_task:
-  osx_instance:
+  macos_instance:
     image: catalina-xcode-11.6
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
diff --git a/auxil/broker b/auxil/broker
index 7b4eddcc69..e8f0f1e895 160000
--- a/auxil/broker
+++ b/auxil/broker
@@ -1 +1 @@
-Subproject commit 7b4eddcc69d7fb2ce74e825c8913cb72dd73ad14
+Subproject commit e8f0f1e895593778973528f307a64dd58d9f6416
diff --git a/auxil/zeek-archiver b/auxil/zeek-archiver
index 49c49193f8..893c508e55 160000
--- a/auxil/zeek-archiver
+++ b/auxil/zeek-archiver
@@ -1 +1 @@
-Subproject commit 49c49193f8869b9bce8dfc992901d7ec60c1d37e
+Subproject commit 893c508e55539711db7b310f04bbf1f210834cbc