diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb610fdc90..83b2a3fde5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,6 +214,9 @@ endif()
 # firebase-ios-sdk since it's not needed and can sometimes fail to build.
 set(FIRESTORE_INCLUDE_OBJC OFF CACHE BOOL "Disabled for the CPP SDK")
 
+# Disable re2 build tests
+set(RE2_BUILD_TESTING OFF CACHE BOOL "")
+
 if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
   # Quote meta characters in ${CMAKE_CURRENT_LIST_DIR} so we can
   # match it in a regex.
diff --git a/build_scripts/android/build.sh b/build_scripts/android/build.sh
index 16e4d456ab..0632b5ebc7 100755
--- a/build_scripts/android/build.sh
+++ b/build_scripts/android/build.sh
@@ -44,7 +44,7 @@ set +e
 # network connectivity issues that cause the download to fail.
 gradleparams="-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false\
  -Dmaven.wagon.httpconnectionManager.ttlSeconds=120"
-for retry in {1..10} error; do
+for retry in {1..1} error; do
     if [[ $retry == "error" ]]; then exit 5; fi
     ./gradlew assembleRelease "${gradleparams}" && break
     sleep 300
diff --git a/cmake/external/firestore.cmake b/cmake/external/firestore.cmake
index 7cb97c0ce9..ea96e6fb57 100644
--- a/cmake/external/firestore.cmake
+++ b/cmake/external/firestore.cmake
@@ -18,17 +18,13 @@ if(TARGET firestore)
   return()
 endif()
 
-# If the format of the line below changes, then be sure to update
-# https://github.com/firebase/firebase-cpp-sdk/blob/fd054fa016/.github/workflows/update-dependencies.yml#L81
-set(version CocoaPods-9.0.0)
-
 function(GetReleasedDep)
-  message("Getting released firebase-ios-sdk @ ${version}")
   ExternalProject_Add(
     firestore
 
     DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
-    URL https://github.com/firebase/firebase-ios-sdk/archive/${version}.tar.gz
+    GIT_REPOSITORY "https://github.com/firebase/firebase-ios-sdk.git"
+    GIT_TAG c4c3d2f33c44c5fab79e4008ae086fa5bc7c0028
 
     PREFIX ${PROJECT_BINARY_DIR}