diff --git a/.github/workflows/daily-issues-recap.yml b/.github/workflows/daily-issues-recap.yml
index c3d5f1d863..cba067883c 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       issues: read
diff --git a/.github/workflows/daily-pr-recap.yml b/.github/workflows/daily-pr-recap.yml
index 70c6402351..e32e87dccb 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: read
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2dff45bc60..a77793cacf 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 
diff --git a/.github/workflows/docs-update.yml b/.github/workflows/docs-update.yml
index af02de578c..24b057638a 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       id-token: write
       contents: write
diff --git a/.github/workflows/duplicate-issues.yml b/.github/workflows/duplicate-issues.yml
index 0269e211b9..fff1b4fa95 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       issues: write
diff --git a/.github/workflows/duplicate-prs.yml b/.github/workflows/duplicate-prs.yml
index 832f9e1363..94b5f49152 100644
--- a/.github/workflows/duplicate-prs.yml
+++ b/.github/workflows/duplicate-prs.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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: write
diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml
index 29cc989539..22a812e5e8 100644
--- a/.github/workflows/generate.yml
+++ b/.github/workflows/generate.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   generate:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
diff --git a/.github/workflows/nix-desktop.yml b/.github/workflows/nix-desktop.yml
index 3d7c480313..19fa67e32d 100644
--- a/.github/workflows/nix-desktop.yml
+++ b/.github/workflows/nix-desktop.yml
@@ -26,8 +26,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - blacksmith-4vcpu-ubuntu-2404
-          - blacksmith-4vcpu-ubuntu-2404-arm
+          - ubuntu-latest
+          - ubuntu-24.04-arm
           - macos-15-intel
           - macos-latest
     runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/notify-discord.yml b/.github/workflows/notify-discord.yml
index ac53ba0f7b..84a702a6eb 100644
--- a/.github/workflows/notify-discord.yml
+++ b/.github/workflows/notify-discord.yml
@@ -9,7 +9,7 @@ jobs:
     # kilocode_change start - disabled for kilo-cli fork (OpenCode Discord notifications)
     if: false
     # kilocode_change end
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - name: Send nicely-formatted embed to Discord
         uses: SethCohen/github-releases-to-discord@v1
diff --git a/.github/workflows/opencode.yml b/.github/workflows/opencode.yml
index 4f08aa9fec..5d020130d6 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       id-token: write
       contents: read
diff --git a/.github/workflows/publish-github-action.yml b/.github/workflows/publish-github-action.yml
index a6558488e9..cf28a4402a 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/publish-vscode.yml b/.github/workflows/publish-vscode.yml
index 5c9ac4a2fe..35d58a5e71 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 86bd0b1632..26b7b7ecb4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -30,7 +30,7 @@ permissions:
 
 jobs:
   publish:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     # kilocode_change start - disabled for kilo-cli fork (OpenCode npm/AUR publishing)
     if: false
     # kilocode_change end - original: if: github.repository == 'anomalyco/opencode'
@@ -103,11 +103,11 @@ jobs:
             target: x86_64-apple-darwin
           - host: macos-latest
             target: aarch64-apple-darwin
-          - host: blacksmith-4vcpu-windows-2025
+          - host: windows-latest
             target: x86_64-pc-windows-msvc
-          - host: blacksmith-4vcpu-ubuntu-2404
+          - host: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-          - host: blacksmith-4vcpu-ubuntu-2404-arm
+          - host: ubuntu-24.04-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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/release-github-action.yml b/.github/workflows/release-github-action.yml
index 5127130200..4e258d6d46 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index 72a26d5b11..2c3fd3ae1d 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: write
diff --git a/.github/workflows/stats.yml b/.github/workflows/stats.yml
index 45d976629f..4c806b1967 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 == 'anomalyco/opencode'
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: write
 
diff --git a/.github/workflows/sync-zed-extension.yml b/.github/workflows/sync-zed-extension.yml
index 73d75888bd..37ced73dc3 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d95de94d23..ba80a69540 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         settings:
           - name: linux
-            host: blacksmith-4vcpu-ubuntu-2404
+            host: ubuntu-latest
             playwright: bunx playwright install --with-deps
             workdir: .
             command: |
diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
index f1dfef5793..2914cb089c 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: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       issues: write
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 011e23f5f6..8943e10be3 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   typecheck:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/update-nix-hashes.yml b/.github/workflows/update-nix-hashes.yml
index 7175f4fbdd..924af80583 100644
--- a/.github/workflows/update-nix-hashes.yml
+++ b/.github/workflows/update-nix-hashes.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   update-node-modules-hashes:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     env:
       TITLE: node_modules hashes