diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eece7ee..7d4c212 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   ci:
-    runs-on: blacksmith-2vcpu-ubuntu-2404-arm
+    runs-on: blacksmith-2vcpu-ubuntu-2604-arm
     timeout-minutes: 10
     steps:
       - uses: useblacksmith/checkout@v1
@@ -59,7 +59,7 @@ jobs:
         run: uv run pytest tests/ -v --cov=agentscore_commerce --cov-report=term-missing
 
   test:
-    runs-on: blacksmith-2vcpu-ubuntu-2404-arm
+    runs-on: blacksmith-2vcpu-ubuntu-2604-arm
     timeout-minutes: 10
     strategy:
       fail-fast: false
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 2370b05..3dd5c25 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-26.04
     timeout-minutes: 15
     steps:
       - uses: actions/checkout@v7
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index 520b6c2..12fae8a 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -17,7 +17,7 @@ permissions:
 jobs:
   osv-scan:
     name: Dependency Scan
-    runs-on: blacksmith-2vcpu-ubuntu-2404-arm
+    runs-on: blacksmith-2vcpu-ubuntu-2604-arm
     timeout-minutes: 5
     steps:
       - uses: useblacksmith/checkout@v1
@@ -35,7 +35,7 @@ jobs:
 
   pip-audit:
     name: Python Audit
-    runs-on: blacksmith-2vcpu-ubuntu-2404-arm
+    runs-on: blacksmith-2vcpu-ubuntu-2604-arm
     timeout-minutes: 5
     steps:
       - uses: useblacksmith/checkout@v1