diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1fced5c1..7979d86e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -70,6 +70,10 @@ steps:
           - "--no-tunnel"
           - "--aws-public-ip"
           - "--fail-fast"
+      test-collector#v1.10.2:
+        files: "reports/TEST-*.xml"
+        format: "junit"
+        branch: "^main|next$$"
     concurrency: 25
     concurrency_group: 'bitbar'
     concurrency_method: eager
@@ -110,6 +114,10 @@ steps:
           - "--device=ANDROID_12"
           - "--appium-version=1.22.0"
           - "--fail-fast"
+      test-collector#v1.10.2:
+        files: "reports/TEST-*.xml"
+        format: "junit"
+        branch: "^main|next$$"
     concurrency: 5
     concurrency_group: 'browserstack-app'
     concurrency_method: eager
diff --git a/docker-compose.yml b/docker-compose.yml
index bf1d84d6..2c5f70a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,15 +20,18 @@ services:
       BUILDKITE_REPO:
       BUILDKITE_RETRY_COUNT:
       BUILDKITE_STEP_KEY:
+      BUILDKITE_ANALYTICS_TOKEN:
       MAZE_BUGSNAG_API_KEY:
       BROWSER_STACK_USERNAME:
       BROWSER_STACK_ACCESS_KEY:
+      MAZE_NO_FAIL_FAST:
     ports:
       - "9000-9499:9339"
     volumes:
       - ./features/:/app/features/
       - ./maze_output:/app/maze_output
       - /var/run/docker.sock:/var/run/docker.sock
+      - ./reports/:/app/reports/
 
 networks:
   default:
diff --git a/features/support/maze.buildkite.cfg b/features/support/maze.buildkite.cfg
new file mode 100644
index 00000000..c5bc1827
--- /dev/null
+++ b/features/support/maze.buildkite.cfg
@@ -0,0 +1,3 @@
+--format=junit
+--out=reports
+--format=pretty