diff --git a/.github/workflows/ci-status.yml b/.github/workflows/ci-status.yml
index 183798ac7..4dfe0ab4b 100644
--- a/.github/workflows/ci-status.yml
+++ b/.github/workflows/ci-status.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   report:
     name: Report CI Status
-    runs-on: builder
+    runs-on: tenki-standard-autoscale
     if: ${{ github.event.workflow_run.conclusion == 'failure' }}
     steps:
       - name: Report Failure
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 2f6d98f8c..ea0b0f2b5 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -13,12 +13,12 @@ env:
 jobs:
   validate:
     name: Validate & Test
-    runs-on: builder  # Self-hosted runner
+    runs-on: tenki-standard-autoscale
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Required for github-env.sh comparisons
+          fetch-depth: 0 # Required for github-env.sh comparisons
       # Cache can be local on self-hosted runner for better performance
       - name: Cache Dependencies
         uses: actions/cache@v4
@@ -57,4 +57,4 @@ jobs:
           # Clean build artifacts to prevent disk fill
           make clean || true
           # Keep caches but remove build outputs
-          rm -rf dist/ build/ || true
+          rm -rf dist/ build/ || true
\ No newline at end of file