diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7d348b3d740ce..cb78da9b59371 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-latest-x64-16x
+      - buildjet-16vcpu-ubuntu-2204
     concurrency:
       group: "${{ github.head_ref }}-windows-x64-stage-1"
       cancel-in-progress: true
@@ -169,10 +169,6 @@ jobs:
           name: windows-${{ env.ARCH }}-stage-1-${{ github.run_id }}
           path: |
             obj-${{ env.ARCH }}/dist/waterfox
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
   build-windows-x64-stage-2:
     name: Windows Stage 2
     defaults:
@@ -215,16 +211,12 @@ jobs:
           path: |
             merged.profdata
             en-US.log
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
   build-windows-x64-stage-3:
     name: Windows Stage 3
     needs:
       - build-windows-x64-stage-2
     runs-on:
-      - warp-ubuntu-latest-x64-16x
+      - buildjet-16vcpu-ubuntu-2204
     concurrency:
       group: "${{ github.head_ref }}-windows-x64-stage-3"
       cancel-in-progress: true
@@ -470,14 +462,10 @@ jobs:
             Install\ Waterfox.exe
             waterfox-${{ env.VERSION_DISPLAY }}.complete.mar
             update.xml
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
   build-macos-multi-stage-1:
     name: macOS Stage 1
     runs-on:
-      - warp-ubuntu-latest-x64-16x
+      - buildjet-16vcpu-ubuntu-2204
     strategy:
       matrix:
         arch:
@@ -581,10 +569,6 @@ jobs:
             ./obj-${{ matrix.arch }}/dist/waterfox/*.app
             ./obj-${{ matrix.arch }}/dist/host/bin/mar
           retention-days: 1
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
   build-macos-multi-stage-2:
     name: macOS Stage 2
     runs-on: ${{ matrix.runs-on }}
@@ -645,14 +629,10 @@ jobs:
           path: |
             merged.profdata
             en-US.log
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
   build-macos-multi-stage-3:
     name: macOS Stage 3
     runs-on:
-      - warp-ubuntu-latest-x64-16x
+      - buildjet-16vcpu-ubuntu-2204
     needs:
       - build-macos-multi-stage-2
     strategy:
@@ -766,10 +746,6 @@ jobs:
             ./obj-${{ matrix.arch }}/dist/waterfox/*.app
             ./obj-${{ matrix.arch }}/dist/host/bin/mar
           retention-days: 1
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
   macos-unify:
     name: macOS Universal
     if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
@@ -910,14 +886,10 @@ jobs:
             Waterfox ${{ env.VERSION_DISPLAY }}.dmg.sha512
             waterfox-${{ env.VERSION_DISPLAY }}.complete.mar
             update.xml
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
   build-linux-x64:
     name: Linux
     runs-on:
-      - warp-ubuntu-latest-x64-16x
+      - buildjet-16vcpu-ubuntu-2204
     concurrency:
       group: "${{ github.head_ref }}-linux-x64"
       cancel-in-progress: true
@@ -1072,10 +1044,6 @@ jobs:
           sed -i "s/SIZE/$SIZE/g" update.xml
 
           sed -i "s/HASH/"$SHA512"/g" update.xml
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
       - name: "\U0001F199 Upload artifact"
         if: ${{ inputs.TRIGGER_EVENT == 'workflow_dispatch' }}
         uses: actions/upload-artifact@v4