diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index eec82f0e..49f9bef8 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -11,6 +11,7 @@ steps:
       queue: opensource-arm-mac-cocoa-12
     env:
       UE_VERSION: "4.27"
+      DEVELOPER_DIR: "/Applications/Xcode13.app"
     commands:
       - rm -rf "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
       - make package
@@ -24,10 +25,11 @@ steps:
 
   - name: 'Build Plugin - UE 4.23'
     agents:
-      queue: opensource-mac-unreal-4.23
+      queue: opensource-mac-cocoa-10.15
     env:
       UE_VERSION: "4.23"
       NDKROOT: /Users/administrator/Library/Android/sdk/ndk/16.1.4479499
+      DEVELOPER_DIR: "/Applications/Xcode11.app"
     commands:
       - rm -rf "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
       - make package
@@ -41,9 +43,10 @@ steps:
   - name: 'Build Plugin - UE 4.25'
     if: build.branch =~ /main|next|^release|^integration/ || build.message =~ /\[full ci\]/
     agents:
-      queue: opensource-mac-unreal-4.25
+      queue: opensource-mac-cocoa-10.15
     env:
       UE_VERSION: "4.25"
+      DEVELOPER_DIR: "/Applications/Xcode12.app"
     commands:
       - rm -rf "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
       - make package
@@ -60,6 +63,7 @@ steps:
       queue: opensource-arm-mac-cocoa-12
     env:
       UE_VERSION: "4.26"
+      DEVELOPER_DIR: "/Applications/Xcode13.app"
     commands:
       - rm -rf "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
       - make package
@@ -73,9 +77,10 @@ steps:
   - name: 'Build Plugin - UE 5 EA'
     if: build.branch =~ /main|next|^release|^integration/ || build.message =~ /\[full ci\]/
     agents:
-      queue: opensource-mac-unreal-5
+      queue: opensource-mac-cocoa-10.15
     env:
       UE_VERSION: "5.0EA"
+      DEVELOPER_DIR: "/Applications/Xcode12.app"
     commands:
       - rm -rf "/Users/administrator/Library/Logs/Unreal Engine/LocalBuildLogs/*"
       - make package
@@ -107,6 +112,7 @@ steps:
       queue: opensource-arm-mac-cocoa-12
     env:
       UE_VERSION: "4.27"
+      DEVELOPER_DIR: "/Applications/Xcode13.app"
     plugins:
       artifacts#v1.5.0:
         download: Build/Plugin/Bugsnag-*-UE_4.27-macOS.zip
@@ -126,6 +132,7 @@ steps:
       queue: opensource-arm-mac-cocoa-12
     env:
       UE_VERSION: "4.27"
+      DEVELOPER_DIR: "/Applications/Xcode13.app"
     plugins:
       artifacts#v1.5.0:
         download: Build/Plugin/Bugsnag-*-UE_4.27-macOS.zip
@@ -145,6 +152,7 @@ steps:
       queue: opensource-arm-mac-cocoa-12
     env:
       UE_VERSION: "4.27"
+      DEVELOPER_DIR: "/Applications/Xcode13.app"
     plugins:
       artifacts#v1.5.0:
         download: Build/Plugin/Bugsnag-*-UE_4.27-macOS.zip