diff --git a/.github/workflows/sdk.crashlytics.yml b/.github/workflows/sdk.crashlytics.yml
index 45e4ed1a190..663380c25ff 100644
--- a/.github/workflows/sdk.crashlytics.yml
+++ b/.github/workflows/sdk.crashlytics.yml
@@ -38,6 +38,30 @@ jobs:
       product: FirebaseCrashlytics
       target: FirebaseCrashlytics-Unit-unit
 
+  catalyst-2:
+    uses: ./.github/workflows/_catalyst.yml
+    with:
+      product: FirebaseCrashlytics
+      target: FirebaseCrashlytics-Unit-unit
+
+  catalyst-3:
+    uses: ./.github/workflows/_catalyst.yml
+    with:
+      product: FirebaseCrashlytics
+      target: FirebaseCrashlytics-Unit-unit
+
+  catalyst-4:
+    uses: ./.github/workflows/_catalyst.yml
+    with:
+      product: FirebaseCrashlytics
+      target: FirebaseCrashlytics-Unit-unit
+
+  catalyst-5:
+    uses: ./.github/workflows/_catalyst.yml
+    with:
+      product: FirebaseCrashlytics
+      target: FirebaseCrashlytics-Unit-unit
+
   pod_lib_lint:
     uses: ./.github/workflows/_cocoapods.yml
     with:
diff --git a/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.m b/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.m
index c7e1a602e83..f3894537b11 100644
--- a/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.m
+++ b/Crashlytics/Crashlytics/Components/FIRCLSBinaryImage.m
@@ -71,7 +71,7 @@ void FIRCLSBinaryImageInit(void) {
   _dyld_register_func_for_add_image(FIRCLSBinaryImageAddedCallback);
   _dyld_register_func_for_remove_image(FIRCLSBinaryImageRemovedCallback);
 
-  dispatch_async(FIRCLSGetBinaryImageQueue(), ^{
+  dispatch_sync(FIRCLSGetBinaryImageQueue(), ^{
     FIRCLSFileClose(&_firclsContext.writable->binaryImage.file);
   });
 }
diff --git a/Crashlytics/Crashlytics/Components/FIRCLSContext.m b/Crashlytics/Crashlytics/Components/FIRCLSContext.m
index 3e46f720435..bd5421ccef3 100644
--- a/Crashlytics/Crashlytics/Components/FIRCLSContext.m
+++ b/Crashlytics/Crashlytics/Components/FIRCLSContext.m
@@ -412,13 +412,9 @@ bool FIRCLSContextRecordMetadata(NSString* rootPath, const FIRCLSContextInitData
   const char* appQualitySessionId = [[initData appQualitySessionId] UTF8String];
   const char* path =
       [[rootPath stringByAppendingPathComponent:FIRCLSReportMetadataFile] fileSystemRepresentation];
-  if (!FIRCLSUnlinkIfExists(path)) {
-    FIRCLSSDKLog("Unable to unlink existing metadata file %s\n", strerror(errno));
-  }
-
   FIRCLSFile file;
 
-  if (!FIRCLSFileInitWithPath(&file, path, false)) {
+  if (!FIRCLSFileInitWithPathMode(&file, path, false, false)) {
     FIRCLSSDKLog("Unable to open metadata file %s\n", strerror(errno));
     return false;
   }