diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index f4f8c05a539..e23f4703bfd 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -113,6 +113,11 @@ jobs:
       run: scripts/setup_spm_tests.sh
     - name: iOS Device and Test Build
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh Firebase-Package iOS-device spmbuildonly
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: spm-ios-device-${{ matrix.os }}-${{ matrix.xcode }}-xcodebuild-build.log
+        path: xcodebuild-build.log
 
   platforms:
     # Don't run on private repo unless it is a PR.
@@ -148,3 +153,9 @@ jobs:
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh version-test ${{ matrix.target }} spm
     - name: Analytics Build Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh analytics-import-test ${{ matrix.target }} spm
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: spm-platforms-${{ matrix.target }}-${{ matrix.os }}-${{ matrix.xcode }}-logs
+        path: xcodebuild-*.log
+
diff --git a/Firestore/CHANGELOG.md b/Firestore/CHANGELOG.md
index 628e3afd826..573f1822684 100644
--- a/Firestore/CHANGELOG.md
+++ b/Firestore/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 12.4.0
+- [fixed] Implemented an internal workaround to fix
+  [CVE-2025-0838](https://nvd.nist.gov/vuln/detail/CVE-2025-0838). (#15300)
+
 # 12.1.0
 - [fixed] Fixed accidental removal of `pod "Firebase/Firestore"` for tvOS in 12.0.0.
 
diff --git a/Package.swift b/Package.swift
index eee9fe9e212..103d380af97 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1566,8 +1566,8 @@ func firestoreTargets() -> [Target] {
     } else {
       return .binaryTarget(
         name: "FirebaseFirestoreInternal",
-        url: "https://dl.google.com/firebase/ios/bin/firestore/12.0.0/rc0/FirebaseFirestoreInternal.zip",
-        checksum: "e7add08e9044ef45f7923d0b9ea5518ddc66b090d3f7e9455382f769e74c48c4"
+        url: "https://dl.google.com/firebase/ios/bin/firestore/12.4.0/rc0/FirebaseFirestoreInternal.zip",
+        checksum: "58b916624c01a56c5de694cfc9c5cc7aabcafb13b54e7bde8c83bacc51a3460d"
       )
     }
   }()