diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index 067043d92..84d2ea9b8 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -309,7 +309,6 @@ jobs:
 
       - name: Build projects and run instrumented screenshot tests
         id: dropshotsverify
-        continue-on-error: true
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
@@ -321,10 +320,8 @@ jobs:
           heap-size: 600M
           profile: ${{ matrix.profile }}
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          # Run tests, if they fail, record screenshots and exit with a failure
-          #TODO: Split the script in multiple lines (note that the action does some parsing that breaks multiline)
           script:
-            ./gradlew :app:connectedDemoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.google.samples.apps.nowinandroid.ui.InstrumentedScreenshotTests -i --daemon
+            ./gradlew :app:connectedDemoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.google.samples.apps.nowinandroid.ui.InstrumentedScreenshotTests --daemon
 
       - name: Prevent pushing new screenshots if this is a fork
         id: checkfork_screenshots_instrumented
@@ -348,10 +345,14 @@ jobs:
           heap-size: 600M
           profile: ${{ matrix.profile }}
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          # Run tests, if they fail, record screenshots and exit with a failure
-          #TODO: Split the script in multiple lines (note that the action does some parsing that breaks multiline)
           script:
-            ./gradlew :app:connectedDemoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.google.samples.apps.nowinandroid.ui.InstrumentedScreenshotTests -Pdropshots.record --daemon -i --stacktrace
+            ./gradlew :app:connectedDemoDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.annotation=com.google.samples.apps.nowinandroid.ui.InstrumentedScreenshotTests -Pdropshots.record --daemon --stacktrace
+
+      - name: Breakpoint if tests failed
+        uses: namespacelabs/breakpoint-action@v0
+        with:
+          duration: 30m
+          authorized-users: jack123, alice321
 
       - name: Checkout new changes (in case another job already uploaded screenshots)
         uses: actions/checkout@v4