diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 77bead45d..4e9d14c3b 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -11,10 +11,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - runner_label: self-hosted-x86
-            arch: x86
-          - runner_label: self-hosted-arm64
-            arch: arm64
+          - runner_label: self-hosted-x64
+            arch: x64
     if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 50358ee7d..ad685bed1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ concurrency:
 jobs:
   plonk:
     name: Plonk Native
-    runs-on: runs-on,cpu=64,ram=256,family=m7i+m7a,hdd=80,image=ubuntu22-full-x64
+    runs-on: [self-hosted, x64]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps: