diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1299009be7..53707d84e7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -598,13 +598,13 @@ steps:
     concurrency_group: 'browserstack-app'
     concurrency_method: eager
 
-  - label: ':bitbar: Android 15 NDK r21 smoke tests'
+  - label: ':browserstack: Android 15 NDK r21 smoke tests'
     depends_on: "fixture-r21"
     timeout_in_minutes: 30
     plugins:
       artifacts#v1.9.0:
         download:
-          - "build/fixture-r21-url.txt"
+          - "build/bs-fixture-r21-url.txt"
           - "build/fixture-r21/*"
         upload:
           - "maze_output/failed/**/*"
@@ -616,11 +616,11 @@ steps:
         command:
           - "features/smoke_tests"
           - "--exclude=features/smoke_tests/01_anr.feature"
-          - "--app=@build/fixture-r21-url.txt"
-          - "--appium-version=1.22"
+          - "--app=@build/bs-fixture-r21-url.txt"
+          - "--appium-version=1.22.0"
           - "--no-tunnel"
           - "--aws-public-ip"
-          - "--farm=bb"
+          - "--farm=bs"
           - "--device=ANDROID_15"
       test-collector#v1.10.2:
         files: "reports/TEST-*.xml"
@@ -628,8 +628,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 15 NDK r21 ANR smoke tests'
diff --git a/features/fixtures/mazerunner/cxx-scenarios-bugsnag/build.gradle b/features/fixtures/mazerunner/cxx-scenarios-bugsnag/build.gradle
index 1cc184d0e3..5f73ea9851 100644
--- a/features/fixtures/mazerunner/cxx-scenarios-bugsnag/build.gradle
+++ b/features/fixtures/mazerunner/cxx-scenarios-bugsnag/build.gradle
@@ -7,11 +7,11 @@ apply plugin: "io.gitlab.arturbosch.detekt"
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 35
     ndkVersion parent.ext.ndkVersion
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 17
     }
 
     buildTypes {
diff --git a/features/fixtures/mazerunner/jvm-scenarios/build.gradle b/features/fixtures/mazerunner/jvm-scenarios/build.gradle
index 5ac7256c16..f23dac4517 100644
--- a/features/fixtures/mazerunner/jvm-scenarios/build.gradle
+++ b/features/fixtures/mazerunner/jvm-scenarios/build.gradle
@@ -7,7 +7,7 @@ apply plugin: "io.gitlab.arturbosch.detekt"
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 35
 
     defaultConfig {
         minSdkVersion 17