diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2b832f50a38..714fdfb0368f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -70,7 +70,7 @@ jobs:
   build-windows-x64-stage-1:
     name: Windows Stage 1
     runs-on:
-      - warp-ubuntu-2404-x64-16x-spot
+      - warp-custom-16x-ubuntu-24
     concurrency:
       group: "${{ github.head_ref }}-windows-x64-stage-1"
       cancel-in-progress: true
@@ -183,7 +183,7 @@ jobs:
     needs:
       - build-windows-x64-stage-2
     runs-on:
-      - warp-ubuntu-2404-x64-16x-spot
+      - warp-custom-16x-ubuntu-24
     concurrency:
       group: "${{ github.head_ref }}-windows-x64-stage-3"
       cancel-in-progress: true
@@ -395,7 +395,7 @@ jobs:
   build-macos-multi-stage-1:
     name: macOS Stage 1
     runs-on:
-      - warp-ubuntu-2404-x64-16x-spot
+      - warp-custom-16x-ubuntu-24
     strategy:
       matrix:
         arch:
@@ -521,7 +521,7 @@ jobs:
   build-macos-multi-stage-3:
     name: macOS Stage 3
     runs-on:
-      - warp-ubuntu-2404-x64-16x-spot
+      - warp-custom-16x-ubuntu-24
     needs:
       - build-macos-multi-stage-2
     strategy:
@@ -737,7 +737,7 @@ jobs:
   build-linux-x64:
     name: Linux
     runs-on:
-      - warp-ubuntu-2404-x64-16x-spot
+      - warp-custom-16x-ubuntu-24
     concurrency:
       group: "${{ github.head_ref }}-linux-x64"
       cancel-in-progress: true
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
index c5cf17806903..2d851d14320c 100644
--- a/.github/workflows/production.yml
+++ b/.github/workflows/production.yml
@@ -35,7 +35,7 @@ jobs:
   soft-release:
     name: "\U0001F313 Soft Release"
     environment: Approval
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Create GitHub release
         uses: ncipollo/release-action@v1
@@ -165,7 +165,7 @@ jobs:
     needs:
       - soft-release
     environment: Approval
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: "\U0001F4BF Setup rclone"
         run: 'curl https://rclone.org/install.sh | sudo bash'