diff --git a/.github/scripts/matrices.py b/.github/scripts/matrices.py
index e61f6e3d5887a..604e32940d483 100755
--- a/.github/scripts/matrices.py
+++ b/.github/scripts/matrices.py
@@ -67,12 +67,14 @@ def __init__(
 
 profile = os.environ.get("PROFILE")
 is_pr = os.environ.get("EVENT_NAME") == "pull_request"
-t_linux_x86 = Target("depot-ubuntu-latest-8", "x86_64-unknown-linux-gnu", "linux-amd64")
+t_linux_x86 = Target(
+    "depot-ubuntu-latest-16", "x86_64-unknown-linux-gnu", "linux-amd64"
+)
 t_linux_arm = Target(
-    "depot-ubuntu-24.04-arm-8", "aarch64-unknown-linux-gnu", "linux-aarch64"
+    "depot-ubuntu-latest-arm-16", "aarch64-unknown-linux-gnu", "linux-aarch64"
 )
 t_macos = Target("depot-macos-latest", "aarch64-apple-darwin", "macosx-aarch64")
-t_windows = Target("depot-windows-latest-8", "x86_64-pc-windows-msvc", "windows-amd64")
+t_windows = Target("depot-windows-latest-16", "x86_64-pc-windows-msvc", "windows-amd64")
 targets = (
     [t_linux_x86, t_windows]
     if is_pr
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index 86f5b3c05df96..c2a138cbb0e65 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -29,7 +29,7 @@ env:
 jobs:
   run-benchmarks:
     name: Run All Benchmarks
-    runs-on: depot-ubuntu-24.04
+    runs-on: foundry-runner
     permissions:
       contents: write
     steps:
@@ -155,7 +155,7 @@ jobs:
   publish-results:
     name: Publish Results
     needs: run-benchmarks
-    runs-on: depot-ubuntu-24.04
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 552541b2b4b7d..e7b23edf6dca6 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -19,7 +19,7 @@ env:
 jobs:
   build:
     name: build and push
-    runs-on: Linux-22.04
+    runs-on: depot-ubuntu-22.04-16
     permissions:
       contents: read
       id-token: write
diff --git a/.github/workflows/nextest.yml b/.github/workflows/nextest.yml
index f8a844fad2b38..f5afbc214b282 100644
--- a/.github/workflows/nextest.yml
+++ b/.github/workflows/nextest.yml
@@ -23,7 +23,7 @@ env:
 jobs:
   matrices:
     name: build matrices
-    runs-on: depot-ubuntu-latest
+    runs-on: ubuntu-latest
     permissions:
       contents: read
     outputs:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a46fd54b9994b..616ffc91a6842 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ env:
 jobs:
   prepare:
     name: Prepare release
-    runs-on: depot-ubuntu-latest
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     permissions:
       contents: write