diff --git a/e2e/bitrise.yml b/e2e/bitrise.yml
index 046d1735d..93c45b974 100644
--- a/e2e/bitrise.yml
+++ b/e2e/bitrise.yml
@@ -42,6 +42,11 @@ trigger_map:
 
 pipelines:
   e2e:
+    # Bitrise's default report name is ci/bitrise/<project_slug>/<event_type>,
+    # which is identical for every pipeline on this app. A second triggered
+    # pipeline would then overwrite this one's commit status. <target_id>
+    # expands to the pipeline id, so each pipeline owns its own check.
+    status_report_name: "ci/bitrise/<target_id>/<event_type>"
     workflows:
       e2e-produce-browserstack-run-plan: {}
       e2e-build-react-native-ios:
@@ -451,6 +456,7 @@ workflows:
       - script@1:
           title: Decide whether the nightly build runs
           timeout: 300
+          no_output_timeout: 150
           inputs:
             - content: |-
                 set -euo pipefail
diff --git a/platforms/react-native/sample/scripts/build_ios b/platforms/react-native/sample/scripts/build_ios
index 898472bfb..6dcef74a8 100755
--- a/platforms/react-native/sample/scripts/build_ios
+++ b/platforms/react-native/sample/scripts/build_ios
@@ -25,18 +25,25 @@ dest="$(get_sim_destination)"
 cd ios
 
 xcbeautify_args=""
-if [ "$CI" = "true" ]; then
+if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
     xcbeautify_args="--renderer github-actions"
 fi
 
-xcodebuild clean build \
-    -workspace CheckoutKitReactNativeDemo.xcworkspace \
-    -scheme CheckoutKitReactNativeDemo \
-    -sdk iphonesimulator \
-    -destination "$dest" \
-    -skipPackagePluginValidation \
-    -disableAutomaticPackageResolution \
-    GCC_PRECOMPILE_PREFIX_HEADER=YES \
-    ASSETCATALOG_COMPILER_OPTIMIZATION=time \
-    COMPILER_INDEX_STORE_ENABLE=NO \
-| xcbeautify $xcbeautify_args
+run_xcodebuild() {
+    xcodebuild clean build \
+        -workspace CheckoutKitReactNativeDemo.xcworkspace \
+        -scheme CheckoutKitReactNativeDemo \
+        -sdk iphonesimulator \
+        -destination "$dest" \
+        -skipPackagePluginValidation \
+        -disableAutomaticPackageResolution \
+        GCC_PRECOMPILE_PREFIX_HEADER=YES \
+        ASSETCATALOG_COMPILER_OPTIMIZATION=time \
+        COMPILER_INDEX_STORE_ENABLE=NO
+}
+
+if command -v xcbeautify >/dev/null 2>&1; then
+    run_xcodebuild | xcbeautify $xcbeautify_args
+else
+    run_xcodebuild
+fi
diff --git a/platforms/react-native/sample/scripts/test_ios b/platforms/react-native/sample/scripts/test_ios
index f5bbb3906..a01e852af 100755
--- a/platforms/react-native/sample/scripts/test_ios
+++ b/platforms/react-native/sample/scripts/test_ios
@@ -35,17 +35,24 @@ else
 fi
 
 xcbeautify_args=""
-if [ "$CI" = "true" ]; then
+if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
     xcbeautify_args="--renderer github-actions"
 fi
 
-xcodebuild test \
-    -workspace RCTIntegrationApp.xcworkspace \
-    -scheme RCTIntegrationApp \
-    -destination "$dest" \
-    -skipPackagePluginValidation \
-    -disableAutomaticPackageResolution \
-    -sdk iphonesimulator \
-    ASSETCATALOG_COMPILER_OPTIMIZATION=time \
-    COMPILER_INDEX_STORE_ENABLE=NO \
-| xcbeautify $xcbeautify_args
+run_xcodebuild() {
+    xcodebuild test \
+        -workspace RCTIntegrationApp.xcworkspace \
+        -scheme RCTIntegrationApp \
+        -destination "$dest" \
+        -skipPackagePluginValidation \
+        -disableAutomaticPackageResolution \
+        -sdk iphonesimulator \
+        ASSETCATALOG_COMPILER_OPTIMIZATION=time \
+        COMPILER_INDEX_STORE_ENABLE=NO
+}
+
+if command -v xcbeautify >/dev/null 2>&1; then
+    run_xcodebuild | xcbeautify $xcbeautify_args
+else
+    run_xcodebuild
+fi
diff --git a/platforms/swift/Scripts/api b/platforms/swift/Scripts/api
index 58dcab750..561c49d29 100755
--- a/platforms/swift/Scripts/api
+++ b/platforms/swift/Scripts/api
@@ -41,9 +41,14 @@ build_for_digester() {
         SWIFT_TREAT_WARNINGS_AS_ERRORS=YES
     )
 
+    local xcbeautify_args=""
+    if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
+        xcbeautify_args="--renderer github-actions"
+    fi
+
     cd "$PACKAGE_ROOT"
     if command -v xcbeautify >/dev/null 2>&1; then
-        "${cmd[@]}" | xcbeautify --renderer github-actions
+        "${cmd[@]}" | xcbeautify $xcbeautify_args
     else
         "${cmd[@]}"
     fi
diff --git a/platforms/swift/Scripts/xcode_run b/platforms/swift/Scripts/xcode_run
index e80845f26..3c7467c2d 100755
--- a/platforms/swift/Scripts/xcode_run
+++ b/platforms/swift/Scripts/xcode_run
@@ -109,7 +109,7 @@ fi
 
 if command -v xcbeautify >/dev/null 2>&1; then
     xcbeautify_args=""
-    if [ "$CI" = "true" ]; then
+    if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
         xcbeautify_args="--renderer github-actions"
     fi
     eval "$xcodebuild_cmd" | xcbeautify $xcbeautify_args