diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4f5648857c2..488bf3a4f63 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,3 +1,5 @@
+agents:
+  queue: mbms
 steps:
   - block: ":rocket: Release!"
     prompt: "Fill out the details for release"
@@ -23,8 +25,8 @@ steps:
     - "nvm install"
     - "npm install"
     - "npm run test-js"
-    - "JAVA_HOME=/usr/local/opt/openjdk@11 npm run test-unit-android -- --release"
-    - "JAVA_HOME=/usr/local/opt/openjdk@11 npm run test-e2e-android-multi -- --release --headless --verbose --ci"
+    - "npm run test-unit-android -- --release"
+    - "npm run test-e2e-android-multi -- --release --headless --verbose --ci"
     key: "android_build"
     timeout_in_minutes: 90
     artifact_paths: "/Users/builder/work/artifacts/**/*"
@@ -41,8 +43,8 @@ steps:
     command:
     - "nvm install"
     - "npm install"
-    - "JAVA_HOME=/usr/local/opt/openjdk@11 npm run test-snapshot-ios -- --release"
-    - "JAVA_HOME=/usr/local/opt/openjdk@11 npm run test-e2e-ios -- --release --multi --ci"
+    - "npm run test-snapshot-ios -- --release"
+    - "npm run test-e2e-ios -- --release --multi --ci"
     key: "ios_e2e"
     timeout_in_minutes: 90
     artifact_paths: "/Users/builder/work/artifacts/**/*"
diff --git a/e2e/ApplicationLifecycleTest.test.js b/e2e/ApplicationLifecycleTest.test.js
index 7d108ee0674..d956a277ce8 100644
--- a/e2e/ApplicationLifecycleTest.test.js
+++ b/e2e/ApplicationLifecycleTest.test.js
@@ -82,7 +82,7 @@ describe.e2e('application lifecycle test', () => {
 
   xit(':android: pressing menu opens dev menu', async () => {
     if (!IS_RELEASE) {
-      Android.pressMenu();
+      await Android.pressMenu();
       await sleep(1000);
       await expect(elementByLabel('Reload')).toBeVisible();
     }
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_opaque_background_push@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_opaque_background_push@2x.png
index a9cd5d21c7a..59971341705 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_opaque_background_push@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_opaque_background_push@2x.png differ
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_tansparent_background_push@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_tansparent_background_push@2x.png
index a9cd5d21c7a..59971341705 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_tansparent_background_push@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_tansparent_background_push@2x.png differ
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_change_pop@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_change_pop@2x.png
index f172648d696..c134c51a632 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_change_pop@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_change_pop@2x.png differ
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_change_push@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_change_push@2x.png
index 1d59e5b8874..c8a9c043a0b 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_change_push@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_change_push@2x.png differ
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_font_pop@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_font_pop@2x.png
index f172648d696..c134c51a632 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_font_pop@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_font_pop@2x.png differ
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_font_push@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_font_push@2x.png
index a3290dba833..ef868fd9a31 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_font_push@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_title_font_push@2x.png differ
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_pop@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_pop@2x.png
index 487562b5058..9e435059d01 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_pop@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_pop@2x.png differ
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_push@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_push@2x.png
index 17084821f48..2b48fe8328e 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_push@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_push@2x.png differ
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_root@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_root@2x.png
index 487562b5058..9e435059d01 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_root@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_translucent_background_root@2x.png differ
diff --git a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_visibility_push@2x.png b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_visibility_push@2x.png
index 17084821f48..2b48fe8328e 100644
Binary files a/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_visibility_push@2x.png and b/playground/ios/SnapshotTests/ReferenceImages_64/StackOptionsTest/testStack_topBar_visibility_push@2x.png differ
diff --git a/scripts/test-snapshot.js b/scripts/test-snapshot.js
index f98446a8139..abbeecd4cbd 100644
--- a/scripts/test-snapshot.js
+++ b/scripts/test-snapshot.js
@@ -3,7 +3,7 @@ const exec = require('shell-utils').exec;
 
 const android = includes(process.argv, '--android');
 const release = includes(process.argv, '--release');
-const BRANCH = process.env.BRANCH;
+const BRANCH = process.env.BUILDKITE_BRANCH;
 const RECORD = process.env.RECORD === 'true';
 
 function run() {
@@ -14,7 +14,7 @@ function run() {
   }
 }
 
-function runAndroidSnapshotTests() {}
+function runAndroidSnapshotTests() { }
 
 function runIosSnapshotTests() {
   exec.execSync('npm run build');