diff --git a/.github/workflows/build-lux-kms.yml b/.github/workflows/build-lux-kms.yml
index e1d748296..47ad60971 100644
--- a/.github/workflows/build-lux-kms.yml
+++ b/.github/workflows/build-lux-kms.yml
@@ -17,7 +17,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: evo
+    runs-on: [self-hosted, linux, amd64]
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4
@@ -49,9 +49,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-          runner-amd64: evo
-          runner-arm64: spark
-          runner-deploy: evo
       - name: Set up Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -68,9 +65,6 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-          runner-amd64: evo
-          runner-arm64: spark
-          runner-deploy: evo
       - name: Summary
         run: |
           echo "### Build complete" >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/build-server-self.yml b/.github/workflows/build-server-self.yml
index 848e12b1b..45b841ec2 100644
--- a/.github/workflows/build-server-self.yml
+++ b/.github/workflows/build-server-self.yml
@@ -22,7 +22,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: evo
+    runs-on: [self-hosted, linux, amd64]
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4