diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 961fbcbfb1..ce35afb4d2 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -79,22 +79,22 @@ jobs:
       matrix:
         include:
           - platform: linux
-            runner: ubuntu-latest
+            runner: depot-ubuntu-24.04
             target: x86_64-unknown-linux-musl
             binary_ext: ""
             arch: x86_64
           - platform: windows
-            runner: ubuntu-latest
+            runner: depot-ubuntu-24.04
             target: x86_64-pc-windows-gnu
             binary_ext: ".exe"
             arch: x86_64
           - platform: macos
-            runner: ubuntu-latest
+            runner: depot-ubuntu-24.04
             target: x86_64-apple-darwin
             binary_ext: ""
             arch: x86_64
           - platform: macos
-            runner: ubuntu-latest
+            runner: depot-ubuntu-24.04
             target: aarch64-apple-darwin
             binary_ext: ""
             arch: aarch64
@@ -155,10 +155,10 @@ jobs:
         include:
           # TODO(RVT-4479): Add back ARM builder once manifest generation fixed
           # - platform: linux/arm64
-          #   runner: ubuntu-latest
+          #   runner: depot-ubuntu-24.04
           #   arch_suffix: -arm64
           - platform: linux/x86_64
-            runner: ubuntu-latest
+            runner: depot-ubuntu-24.04
             # TODO: Replace with appropriate arch_suffix when needed
             # arch_suffix: -amd64
             arch_suffix: ''
@@ -246,4 +246,4 @@ jobs:
               ./scripts/release/main.ts --version "${{ github.event.inputs.version }}" --completeCi
           else
               ./scripts/release/main.ts --version "${{ github.event.inputs.version }}" --no-latest --completeCi
-          fi
\ No newline at end of file
+          fi
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 1671a3fc41..745f5ae9cd 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -43,7 +43,7 @@ jobs:
 
   # clippy:
   #   name: Clippy
-  #   runs-on: ubuntu-latest
+  #   runs-on: depot-ubuntu-24.04
   #   steps:
   #     - uses: actions/checkout@v4
       
@@ -59,7 +59,7 @@ jobs:
 
   check:
     name: Check
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       
@@ -77,7 +77,7 @@ jobs:
 
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: depot-ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       
diff --git a/sdks/typescript/runner/src/mod.ts b/sdks/typescript/runner/src/mod.ts
index 7d26a37925..2623d63848 100644
--- a/sdks/typescript/runner/src/mod.ts
+++ b/sdks/typescript/runner/src/mod.ts
@@ -127,7 +127,7 @@ export class Runner {
 		// The server will send a StopActor command if it wants to fully stop
 	}
 
-	stopActor(actorId: string, generation?: number) {
+	async stopActor(actorId: string, generation?: number) {
 		const actor = this.#removeActor(actorId, generation);
 		if (!actor) return;
 
@@ -136,11 +136,14 @@ export class Runner {
 			this.#tunnel.unregisterActor(actor);
 		}
 
-		this.#sendActorStateUpdate(actorId, actor.generation, "stopped");
-
-		this.#config.onActorStop(actorId, actor.generation).catch((err) => {
+		// If onActorStop times out, Pegboard will handle this timeout with ACTOR_STOP_THRESHOLD_DURATION_MS
+		try {
+			await this.#config.onActorStop(actorId, actor.generation);
+		} catch (err) {
 			console.error(`Error in onActorStop for actor ${actorId}:`, err);
-		});
+		}
+
+		this.#sendActorStateUpdate(actorId, actor.generation, "stopped");
 	}
 
 	#stopAllActors() {