diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index 77f0c20729..125b9b207b 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -127,7 +127,7 @@ jobs:
         cuda: ["12.8", "12.9", "13.0"]
         arch: ['x86_64', 'aarch64']
 
-    runs-on: [self-hosted, "${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}"]
+    runs-on: [self-hosted, linux, "${{ matrix.arch == 'aarch64' && 'arm64' || 'x64' }}", cpu, on-demand]
 
     steps:
       - name: Display Machine Information
@@ -281,7 +281,7 @@ jobs:
       matrix:
         cuda: ["12.9", "13.0"]
         test-shard: [1, 2, 3, 4, 5]
-    runs-on: [self-hosted, G5, X64]
+    runs-on: [self-hosted, linux, x64, gpu, sm86, on-demand]
 
     steps:
       - name: Display Machine Information
diff --git a/.github/workflows/release-ci-docker.yml b/.github/workflows/release-ci-docker.yml
index 3fb36129e1..0f1686fe88 100644
--- a/.github/workflows/release-ci-docker.yml
+++ b/.github/workflows/release-ci-docker.yml
@@ -32,7 +32,7 @@ jobs:
           echo "Generated version tag: ${DATE_SHA}"
 
   build:
-    runs-on: [self-hosted, x86_64]
+    runs-on: [self-hosted, linux, x64, cpu, on-demand]
     needs: generate-tag
     strategy:
       matrix:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b11e72e1f7..d91f1b7908 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -163,7 +163,7 @@ jobs:
         cuda: ["12.8", "12.9", "13.0"]
         arch: ['x86_64', 'aarch64']
 
-    runs-on: [self-hosted, "${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}"]
+    runs-on: [self-hosted, linux, "${{ matrix.arch == 'aarch64' && 'arm64' || 'x64' }}", cpu, on-demand]
 
     steps:
       - name: Display Machine Information