diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 4a7ed7c7..f9617f20 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -24,22 +24,22 @@ steps:
             - expo-maze-runner:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-${BRANCH_NAME}
             - expo-maze-runner:855461928731.dkr.ecr.us-west-1.amazonaws.com/js:ci-latest
 
-  - label:  ':android: Build expo APK'
-    key: "build-expo-apk"
-    timeout_in_minutes: 20
-    agents:
-      queue: "opensource-arm-mac-cocoa-12"
-    env:
-      EXPO_RELEASE_CHANNEL: ${BUILDKITE_BUILD_ID}
-    artifact_paths: build/output.apk
-    commands:
-      - test/scripts/build-android.sh
+  # - label:  ':android: Build expo APK'
+  #   key: "build-expo-apk"
+  #   timeout_in_minutes: 20
+  #   agents:
+  #     queue: "opensource-arm-mac-cocoa-12"
+  #   env:
+  #     EXPO_RELEASE_CHANNEL: ${BUILDKITE_BUILD_ID}
+  #   artifact_paths: build/output.apk
+  #   commands:
+  #     - test/scripts/build-android.sh
 
   - label: ':apple: Build expo IPA'
     key: "build-expo-ipa"
     timeout_in_minutes: 20
     agents:
-      queue: "opensource-arm-mac-cocoa-12"
+      queue: "ms-arm-12-8"
     env:
       EXPO_RELEASE_CHANNEL: ${BUILDKITE_BUILD_ID}
       DEVELOPER_DIR: "/Applications/Xcode13.4.app"
diff --git a/test/features/fixtures/test-app/eas.json b/test/features/fixtures/test-app/eas.json
index 4fbf1c99..cad72d65 100644
--- a/test/features/fixtures/test-app/eas.json
+++ b/test/features/fixtures/test-app/eas.json
@@ -8,6 +8,9 @@
       "credentialsSource": "local",
       "android": {
         "buildType": "apk"
+      },
+      "ios": {
+        "enterpriseProvisioning": "universal"
       }
     }
   },