diff --git a/.buildkite/basic/react-native-cli-pipeline.yml b/.buildkite/basic/react-native-cli-pipeline.yml
index 474bbb8cad..e138522cb3 100644
--- a/.buildkite/basic/react-native-cli-pipeline.yml
+++ b/.buildkite/basic/react-native-cli-pipeline.yml
@@ -10,7 +10,7 @@ steps:
         depends_on: "publish-js"
         timeout_in_minutes: 15
         agents:
-          queue: macos-14-isolated
+          queue: "macos-14-isolated"
         env:
           JAVA_VERSION: "17"
           NODE_VERSION: "18"
@@ -23,7 +23,7 @@ steps:
         commands:
           - "cd test/react-native-cli"
           - "bundle install"
-          - "bundle exec maze-runner --port=$((MAZE_RUNNER_PORT)) features/build-app-tests/build-android-app.feature"
+          - "bundle exec maze-runner features/build-app-tests/build-android-app.feature"
         matrix:
           - "0.79"
           - "0.78"
@@ -52,7 +52,7 @@ steps:
         commands:
           - "cd test/react-native-cli"
           - "bundle install"
-          - "bundle exec maze-runner --port=$((MAZE_RUNNER_PORT)) features/build-app-tests/build-ios-app.feature"
+          - "bundle exec maze-runner features/build-app-tests/build-ios-app.feature"
         matrix:
           - "0.79"
           - "0.78"
diff --git a/scripts/init-rn-cli.sh b/scripts/init-rn-cli.sh
index 1801d49b25..b156bb7c78 100755
--- a/scripts/init-rn-cli.sh
+++ b/scripts/init-rn-cli.sh
@@ -9,7 +9,7 @@ set notifier_version [lindex $argv 0]
 set rn_version [lindex $argv 1]
 set fixture_path [lindex $argv 2]
 
-set MAZE_RUNNER_PORT $env(MAZE_RUNNER_PORT)
+set MAZE_PORT $env(MAZE_PORT)
 
 # Process React Native version string
 set rn_version_cleaned [string map {".expo.ejected" "" "_" "."} [string range $rn_version 2 end]]
@@ -25,10 +25,10 @@ spawn ./node_modules/.bin/bugsnag-react-native-cli init
 # Handle CLI prompts
 expect "Do you want to continue anyway?" { send -- "Y\r" }
 expect "Are you using Bugsnag on-premise?" { send -- "Y\r" }
-expect "What is your Bugsnag notify endpoint?" { send -- "http://bs-local.com:$MAZE_RUNNER_PORT/notify\r" }
-expect "What is your Bugsnag sessions endpoint?" { send -- "http://bs-local.com:$MAZE_RUNNER_PORT/sessions\r" }
-expect "What is your Bugsnag upload endpoint?" { send -- "http://localhost:$MAZE_RUNNER_PORT\r" }
-expect "What is your Bugsnag build endpoint?" { send -- "http://localhost:$MAZE_RUNNER_PORT/builds\r" }
+expect "What is your Bugsnag notify endpoint?" { send -- "http://bs-local.com:$MAZE_PORT/notify\r" }
+expect "What is your Bugsnag sessions endpoint?" { send -- "http://bs-local.com:$MAZE_PORT/sessions\r" }
+expect "What is your Bugsnag upload endpoint?" { send -- "http://localhost:$MAZE_PORT\r" }
+expect "What is your Bugsnag build endpoint?" { send -- "http://localhost:$MAZE_PORT/builds\r" }
 expect "If you want the latest version of @bugsnag/react-native hit enter, otherwise type the version you want" { send -- "$notifier_version\r" }
 expect "What is your Bugsnag project API key?" { send -- "1234567890ABCDEF1234567890ABCDEF\r" }
 expect "Do you want to install the BugSnag CLI to allow you to upload JavaScript source maps?" { send -- "Y\r" }