diff --git a/.buildkite/release-pipelines/complete-code-freeze.yml b/.buildkite/release-pipelines/complete-code-freeze.yml
index ab07b6018..0fd213192 100644
--- a/.buildkite/release-pipelines/complete-code-freeze.yml
+++ b/.buildkite/release-pipelines/complete-code-freeze.yml
@@ -4,7 +4,7 @@
 # Variables used in this pipeline are defined in `shared-pipeline-vars`, which is `source`'d before calling `buildkite-agent pipeline upload`
 
 agents:
-    queue: tumblr-metal
+    queue: mac-metal
 
 steps:
   - label: Complete Code Freeze
diff --git a/.buildkite/release-pipelines/finalize-release.yml b/.buildkite/release-pipelines/finalize-release.yml
index 9beecbb3a..8f12b26e3 100644
--- a/.buildkite/release-pipelines/finalize-release.yml
+++ b/.buildkite/release-pipelines/finalize-release.yml
@@ -17,7 +17,7 @@ steps:
       echo '--- :shipit: Finalize Release'
       bundle exec fastlane finalize_release skip_confirm:true
     agents:
-        queue: tumblr-metal
+        queue: mac-metal
     retry:
       manual:
         # If those jobs fail, one should always prefer re-triggering a new build from Releases V2 rather than retrying the individual job from Buildkite
diff --git a/.buildkite/release-pipelines/new-beta-release.yml b/.buildkite/release-pipelines/new-beta-release.yml
index 932e8bcab..aa6128f7e 100644
--- a/.buildkite/release-pipelines/new-beta-release.yml
+++ b/.buildkite/release-pipelines/new-beta-release.yml
@@ -20,7 +20,7 @@ steps:
       echo '--- :shipit: New Beta Release'
       bundle exec fastlane new_beta_release skip_confirm:true
     agents:
-        queue: tumblr-metal
+        queue: mac-metal
     retry:
       manual:
         # If failed, we prefer retrying via Releases V2 rather than Buildkite.
diff --git a/.buildkite/release-pipelines/publish-release.yml b/.buildkite/release-pipelines/publish-release.yml
index 878fbe0c6..7a9604a55 100644
--- a/.buildkite/release-pipelines/publish-release.yml
+++ b/.buildkite/release-pipelines/publish-release.yml
@@ -17,7 +17,7 @@ steps:
       echo '--- :package: Publish Release'
       bundle exec fastlane publish_release skip_confirm:true
     agents:
-      queue: tumblr-metal
+      queue: mac-metal
     retry:
       manual:
         # If those jobs fail, one should always prefer re-triggering a new build from Releases V2 rather than retrying the individual job from Buildkite
diff --git a/.buildkite/release-pipelines/start-code-freeze.yml b/.buildkite/release-pipelines/start-code-freeze.yml
index 697663a75..d75fe84ef 100644
--- a/.buildkite/release-pipelines/start-code-freeze.yml
+++ b/.buildkite/release-pipelines/start-code-freeze.yml
@@ -8,7 +8,7 @@ steps:
     plugins:
       - $CI_TOOLKIT_PLUGIN
     agents:
-        queue: tumblr-metal
+        queue: mac-metal
     command: |
       echo '--- :robot_face: Use bot for Git operations'
       source use-bot-for-git