diff --git a/.github/workflows/daily-issues-recap.yml b/.github/workflows/daily-issues-recap.yml
index 43583ddd6f..375c9c31a4 100644
--- a/.github/workflows/daily-issues-recap.yml
+++ b/.github/workflows/daily-issues-recap.yml
@@ -11,7 +11,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode Discord integration)
     if: false
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       issues: read
diff --git a/.github/workflows/daily-pr-recap.yml b/.github/workflows/daily-pr-recap.yml
index 5a9acdcb57..b540be4850 100644
--- a/.github/workflows/daily-pr-recap.yml
+++ b/.github/workflows/daily-pr-recap.yml
@@ -11,7 +11,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode Discord integration)
     if: false
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       pull-requests: read
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2f42514f5d..2dff45bc60 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -14,7 +14,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode infrastructure deployment)
     if: false
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v3
 
diff --git a/.github/workflows/docs-update.yml b/.github/workflows/docs-update.yml
index c931552b64..49aa8a5c2e 100644
--- a/.github/workflows/docs-update.yml
+++ b/.github/workflows/docs-update.yml
@@ -13,7 +13,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode docs automation)
     if: false
     # kilocode_change end - original: if: github.repository == 'sst/opencode'
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       id-token: write
       contents: write
diff --git a/.github/workflows/duplicate-issues.yml b/.github/workflows/duplicate-issues.yml
index c093dd9f5b..562426cca8 100644
--- a/.github/workflows/duplicate-issues.yml
+++ b/.github/workflows/duplicate-issues.yml
@@ -9,7 +9,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (requires OpenCode API key and install)
     if: false
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       issues: write
diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml
index 4679b59c90..6f6123b46d 100644
--- a/.github/workflows/generate.yml
+++ b/.github/workflows/generate.yml
@@ -10,7 +10,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode Discord integration)
     if: false
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/nix-hashes.yml b/.github/workflows/nix-hashes.yml
index 21f374f10f..6dbad4da8f 100644
--- a/.github/workflows/nix-hashes.yml
+++ b/.github/workflows/nix-hashes.yml
@@ -26,7 +26,7 @@ jobs:
     if: false
     # if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     env:
       TITLE: node_modules hashes
 
diff --git a/.github/workflows/opencode.yml b/.github/workflows/opencode.yml
index 4b096fef48..63ae22580d 100644
--- a/.github/workflows/opencode.yml
+++ b/.github/workflows/opencode.yml
@@ -17,7 +17,7 @@ jobs:
     #   startsWith(github.event.comment.body, '/oc') ||
     #   contains(github.event.comment.body, ' /opencode') ||
     #   startsWith(github.event.comment.body, '/opencode')
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       id-token: write
       contents: read
diff --git a/.github/workflows/pr-management.yml b/.github/workflows/pr-management.yml
index ecc9d4bba4..cbb0cdd415 100644
--- a/.github/workflows/pr-management.yml
+++ b/.github/workflows/pr-management.yml
@@ -21,7 +21,7 @@ jobs:
     #   github.event.pull_request.user.login != 'adamdotdevin' &&
     #   github.event.pull_request.user.login != 'iamdavidhill' &&
     #   github.event.pull_request.user.login != 'opencode-agent[bot]'
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       pull-requests: write
diff --git a/.github/workflows/pr-standards.yml b/.github/workflows/pr-standards.yml
index 123013eea6..0118d29576 100644
--- a/.github/workflows/pr-standards.yml
+++ b/.github/workflows/pr-standards.yml
@@ -21,7 +21,7 @@ jobs:
     #   github.event.pull_request.user.login != 'adamdotdevin' &&
     #   github.event.pull_request.user.login != 'iamdavidhill' &&
     #   github.event.pull_request.user.login != 'opencode-agent[bot]'
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       pull-requests: write
     steps:
diff --git a/.github/workflows/publish-github-action.yml b/.github/workflows/publish-github-action.yml
index 6df803e2a5..a6558488e9 100644
--- a/.github/workflows/publish-github-action.yml
+++ b/.github/workflows/publish-github-action.yml
@@ -17,7 +17,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode GitHub Action publishing)
     if: false
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/publish-vscode.yml b/.github/workflows/publish-vscode.yml
index 69ea83589f..5c9ac4a2fe 100644
--- a/.github/workflows/publish-vscode.yml
+++ b/.github/workflows/publish-vscode.yml
@@ -16,7 +16,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode VSCode extension publishing)
     if: false
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c4fca8054b..8f13dcf55c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -30,7 +30,7 @@ permissions:
 
 jobs:
   publish:
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     # kilocode_change start - disabled for kilo-cli fork (OpenCode npm/AUR publishing)
     if: false
     # kilocode_change end - original: if: github.repository == 'Kilo-Org/kilo'
@@ -99,15 +99,15 @@ jobs:
       fail-fast: false
       matrix:
         settings:
-          - host: depot-macos-15
+          - host: macos-latest
             target: x86_64-apple-darwin
-          - host: depot-macos-15
+          - host: macos-latest
             target: aarch64-apple-darwin
-          - host: depot-windows-2022-8
+          - host: blacksmith-4vcpu-windows-2025
             target: x86_64-pc-windows-msvc
-          - host: depot-ubuntu-24.04-8
+          - host: blacksmith-4vcpu-ubuntu-2404
             target: x86_64-unknown-linux-gnu
-          - host: depot-ubuntu-24.04-arm-8
+          - host: blacksmith-8vcpu-ubuntu-2404-arm
             target: aarch64-unknown-linux-gnu
     runs-on: ${{ matrix.settings.host }}
     steps:
@@ -212,7 +212,7 @@ jobs:
       - publish
       - publish-tauri
     if: needs.publish.outputs.tag
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/release-github-action.yml b/.github/workflows/release-github-action.yml
index 93baaa0ebb..5127130200 100644
--- a/.github/workflows/release-github-action.yml
+++ b/.github/workflows/release-github-action.yml
@@ -17,7 +17,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode GitHub Action release)
     if: false
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index b86828c0b7..70bd42ce35 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -14,7 +14,7 @@ jobs:
     #   github.event.issue.pull_request &&
     #   startsWith(github.event.comment.body, '/review') &&
     #   contains(fromJson('["OWNER","MEMBER"]'), github.event.comment.author_association)
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       pull-requests: write
diff --git a/.github/workflows/stale-issues.yml b/.github/workflows/stale-issues.yml
index ba3f1bc7a9..2dc74b62fd 100644
--- a/.github/workflows/stale-issues.yml
+++ b/.github/workflows/stale-issues.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   stale:
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       issues: write
     steps:
diff --git a/.github/workflows/stats.yml b/.github/workflows/stats.yml
index dbc8f420f2..648f302f52 100644
--- a/.github/workflows/stats.yml
+++ b/.github/workflows/stats.yml
@@ -12,7 +12,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode stats tracking)
     if: false
     # kilocode_change end - original: if: github.repository == 'Kilo-Org/kilo'
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: write
 
diff --git a/.github/workflows/sync-zed-extension.yml b/.github/workflows/sync-zed-extension.yml
index 1cbfc4b7e5..73d75888bd 100644
--- a/.github/workflows/sync-zed-extension.yml
+++ b/.github/workflows/sync-zed-extension.yml
@@ -11,7 +11,7 @@ jobs:
     if: false
     # kilocode_change end
     name: Release Zed Extension
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eeb4e77149..b98c3b113e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ jobs:
       matrix:
         settings:
           - name: linux
-            host: depot-ubuntu-24.04-4
+            host: blacksmith-4vcpu-ubuntu-2404
             playwright: bunx playwright install --with-deps
             workdir: .
             command: |
@@ -19,7 +19,7 @@ jobs:
               git config --global user.name "opencode"
               bun turbo test
           - name: windows
-            host: depot-windows-2025-4
+            host: windows-latest
             playwright: bunx playwright install
             workdir: packages/app
             command: bun test:e2e:local
diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
index 4b8a5a153d..0e9635e3b5 100644
--- a/.github/workflows/triage.yml
+++ b/.github/workflows/triage.yml
@@ -9,7 +9,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (requires OpenCode API key and install)
     if: false
     # kilocode_change end
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       contents: read
       issues: write
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index a46feef6c1..011e23f5f6 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   typecheck:
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: blacksmith-4vcpu-ubuntu-2404
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4