diff --git a/.buildkite/pipeline.full.yml b/.buildkite/pipeline.full.yml
index d8bc9d5f46..618b2d0244 100644
--- a/.buildkite/pipeline.full.yml
+++ b/.buildkite/pipeline.full.yml
@@ -764,7 +764,7 @@ steps:
     concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
-  - label: ':bitbar: Android 14 NDK r21 end-to-end tests - batch 1'
+  - label: ':browserstack: Android 14 NDK r21 end-to-end tests - batch 1'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
@@ -783,11 +783,9 @@ steps:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^a-k].*.feature"
           - "--exclude=features/full_tests/anr.feature"
-          - "--app=@build/fixture-r21-url.txt"
-          - "--appium-version=1.22"
-          - "--no-tunnel"
-          - "--aws-public-ip"
-          - "--farm=bb"
+          - "--app=@build/bs-fixture-r21-url.txt"
+          - "--appium-version=1.22.0"
+          - "--farm=bs"
           - "--device=ANDROID_14"
       test-collector#v1.10.2:
         files: "reports/TEST-*.xml"
@@ -795,11 +793,11 @@ steps:
         branch: "^master|next$$"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 25
-    concurrency_group: 'bitbar'
+    concurrency: 5
+    concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
-  - label: ':bitbar: Android 14 NDK r21 end-to-end tests - batch 2'
+  - label: ':browserstack: Android 14 NDK r21 end-to-end tests - batch 2'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
@@ -818,10 +816,8 @@ steps:
           - "features/full_tests"
           - "--exclude=features/full_tests/[^l-z].*.feature"
           - "--exclude=features/full_tests/anr.feature"
-          - "--app=@build/fixture-r21-url.txt"
-          - "--appium-version=1.22"
-          - "--no-tunnel"
-          - "--aws-public-ip"
+          - "--app=@build/bs-fixture-r21-url.txt"
+          - "--appium-version=1.22.0"
           - "--farm=bb"
           - "--device=ANDROID_14"
       test-collector#v1.10.2:
@@ -830,8 +826,8 @@ steps:
         branch: "^master|next$$"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 25
-    concurrency_group: 'bitbar'
+    concurrency: 5
+    concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
   - label: ':browserstack: Android 14 NDK r21 end-to-end tests - ANRs'
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 55dd175187..d52f5bcfa4 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -595,7 +595,7 @@ steps:
     concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
-  - label: ':bitbar: Android 14 NDK r21 smoke tests'
+  - label: ':browserstack: Android 14 NDK r21 smoke tests'
     depends_on: "fixture-r21"
     timeout_in_minutes: 60
     plugins:
@@ -613,11 +613,9 @@ steps:
         command:
           - "features/smoke_tests"
           - "--exclude=features/smoke_tests/01_anr.feature"
-          - "--app=@build/fixture-r21-url.txt"
-          - "--appium-version=1.22"
-          - "--no-tunnel"
-          - "--aws-public-ip"
-          - "--farm=bb"
+          - "--app=@build/bs-fixture-r21-url.txt"
+          - "--appium-version=1.22.0"
+          - "--farm=bs"
           - "--device=ANDROID_14"
       test-collector#v1.10.2:
         files: "reports/TEST-*.xml"
@@ -625,8 +623,8 @@ steps:
         branch: "^master|next$$"
     env:
       TEST_FIXTURE_SYMBOL_DIR: "build/fixture-r21"
-    concurrency: 25
-    concurrency_group: 'bitbar'
+    concurrency: 5
+    concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
   - label: ':browserstack: Android 14 NDK r21 ANR smoke tests'
diff --git a/features/fixtures/mazerunner/app/src/main/java/com/bugsnag/android/mazerunner/MazerunnerApp.kt b/features/fixtures/mazerunner/app/src/main/java/com/bugsnag/android/mazerunner/MazerunnerApp.kt
index f07e7fd46c..dc78b71f78 100644
--- a/features/fixtures/mazerunner/app/src/main/java/com/bugsnag/android/mazerunner/MazerunnerApp.kt
+++ b/features/fixtures/mazerunner/app/src/main/java/com/bugsnag/android/mazerunner/MazerunnerApp.kt
@@ -29,7 +29,7 @@ class MazerunnerApp : Application() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             val policy = StrictMode.VmPolicy.Builder()
                 .detectNonSdkApiUsage()
-                .penaltyDeath()
+                .penaltyLog()
                 .build()
             StrictMode.setVmPolicy(policy)
         }