diff --git a/.github/workflows/zip.yml b/.github/workflows/zip.yml
index 325e836c1b2..3a79a940d1e 100644
--- a/.github/workflows/zip.yml
+++ b/.github/workflows/zip.yml
@@ -357,8 +357,7 @@ jobs:
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       SDK: "FirebaseAI"
-      # This is a workaround to use the FirebaseAIExampleZip scheme that does not have the SPM dependency.
-      SWIFT_SUFFIX: "Zip"
+      SWIFT_SUFFIX: " (iOS)"
     strategy:
       matrix:
         artifact: [Firebase-actions-dir, Firebase-actions-dir-dynamic]
@@ -385,7 +384,7 @@ jobs:
         find "${GITHUB_WORKSPACE}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
     - uses: actions/checkout@v4
     - name: Setup quickstart
-      run: SAMPLE="$SDK" TARGET="${SDK}ExampleZip" scripts/setup_quickstart_framework.sh \
+      run: SAMPLE="$SDK" TARGET="${SDK}Example" scripts/setup_quickstart_framework.sh \
                                                "${HOME}"/ios_frameworks/Firebase/FirebaseAILogic/* \
                                                "${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
     - name: Install Secret GoogleService-Info.plist
diff --git a/scripts/test_quickstart_framework.sh b/scripts/test_quickstart_framework.sh
index 8b390536a2a..e4552e4e7a7 100755
--- a/scripts/test_quickstart_framework.sh
+++ b/scripts/test_quickstart_framework.sh
@@ -30,9 +30,5 @@ source scripts/check_secrets.sh
 
 if check_secrets; then
   cd quickstart-ios
-  if [ "$platform" = "swift" ]; then
-    have_secrets=true SAMPLE="$sample" SWIFT_SUFFIX="Swift" "${REPO}"/scripts/zip_quickstart_test.sh
-  else
-    have_secrets=true SAMPLE="$sample" "${REPO}"/scripts/zip_quickstart_test.sh
-  fi
+  have_secrets=true SAMPLE="$sample" "${REPO}"/scripts/zip_quickstart_test.sh
 fi
diff --git a/scripts/zip_quickstart_test.sh b/scripts/zip_quickstart_test.sh
index 0a3cc30ec9a..5f314aaa3e1 100755
--- a/scripts/zip_quickstart_test.sh
+++ b/scripts/zip_quickstart_test.sh
@@ -26,10 +26,6 @@ EXIT_STATUS=0
 
 cd "${SAMPLE}"
 
-if [[ ! -z "$LEGACY" ]]; then
-  cd "Legacy${SAMPLE}Quickstart"
-fi
-
 xcode_version=$(xcodebuild -version | grep Xcode)
 xcode_version="${xcode_version/Xcode /}"
 xcode_major="${xcode_version/.*/}"
@@ -58,7 +54,7 @@ fi
 (
 xcodebuild \
 -project ${PROJECT_NAME} \
--scheme  ${SCHEME_NAME} \
+-scheme  "${SCHEME_NAME}" \
 -destination "platform=iOS Simulator,name=$device_name" "SWIFT_VERSION=5.3" "OTHER_LDFLAGS=\$(OTHER_LDFLAGS) -ObjC" "FRAMEWORK_SEARCH_PATHS= \$(PROJECT_DIR)/Firebase/" HEADER_SEARCH_PATHS='$(inherited) $(PROJECT_DIR)/Firebase' \
 build \
 ) || EXIT_STATUS=$?