diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40aaaa399e..e0aff05910 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ env:
   CI_GRADLE_ARG_PROPERTIES: --stacktrace -Dsonar.gradle.skipCompile=true --no-configuration-cache
 
 jobs:
-  debug:
+  build:
     name: Build APKs
     runs-on: ubuntu-latest
     strategy:
diff --git a/.github/workflows/maestro-local.yml b/.github/workflows/maestro-local.yml
index 459f63884c..b07eb196fd 100644
--- a/.github/workflows/maestro-local.yml
+++ b/.github/workflows/maestro-local.yml
@@ -3,10 +3,7 @@ name: Maestro (local)
 # Run this flow only when APK Build workflow completes
 on:
   workflow_dispatch:
-  workflow_run:
-    workflows: [APK Build]
-    types:
-      - completed
+  pull_request:
 
 # Enrich gradle.properties for CI/CD
 env:
@@ -21,7 +18,6 @@ jobs:
   build-apk:
     name: Build APK
     runs-on: ubuntu-latest
-    if: github.event_name == 'workflow_dispatch'
     # Allow one per PR.
     concurrency:
       group: ${{ format('maestro-{0}', github.ref) }}
@@ -61,8 +57,6 @@ jobs:
     name: Maestro test suite
     runs-on: ubuntu-latest
     needs: [build-apk]
-    # Only if the APKs were built successfully.
-    if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
     # Allow one per PR.
     concurrency:
       group: ${{ format('maestro-{0}', github.ref) }}
@@ -74,16 +68,8 @@ jobs:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.ref }}
-      - name: Download APK artifact from 'Build APKs' flow
-        uses: actions/download-artifact@v4
-        if: github.event.workflow_run.conclusion == 'success'
-        with:
-          name: elementx-apk-maestro
-          run-id: ${{ github.event.workflow_run.id }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Download APK artifact from previous job
         uses: actions/download-artifact@v4
-        if: github.event_name == 'workflow_dispatch'
         with:
           name: elementx-apk-maestro
       - name: Enable KVM group perms
@@ -95,6 +81,7 @@ jobs:
         run: curl -fsSL "https://get.maestro.mobile.dev" | bash
       - name: Run Maestro tests in emulator
         uses: reactivecircus/android-emulator-runner@v2
+        continue-on-error: true
         env:
           MAESTRO_USERNAME: maestroelement
           MAESTRO_PASSWORD: ${{ secrets.MATRIX_MAESTRO_ACCOUNT_PASSWORD }}
diff --git a/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh b/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
index 40aae279be..b94958dba4 100755
--- a/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
+++ b/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
@@ -8,7 +8,6 @@
 #
 
 adb install -r $1
-set -x
 echo "Starting the screen recording..."
 adb push .github/workflows/scripts/maestro/local-recording.sh /data/local/tmp/
 adb shell "chmod +x /data/local/tmp/local-recording.sh"