diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 98bcd84d9b..330afb162d 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -30,7 +30,7 @@ jobs:
           access_token: ${{ github.token }}
   test:
     name: Coverage Report
-    runs-on: custom-runner-AWS-Acala
+    runs-on: [self-hosted, linux]
     needs: clean-up-actions
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b8754718ed..7af1c03194 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           access_token: ${{ github.token }}
   build:
-    runs-on: custom-runner-AWS-Acala
+    runs-on: [self-hosted, linux]
     env:
       SCCACHE_CACHE_SIZE: "50G"
       CARGO_INCREMENTAL: 0
@@ -59,7 +59,7 @@ jobs:
       - name: Run build benches
         run: make build-benches
   benchmarking:
-    runs-on: custom-runner-AWS-Acala
+    runs-on: [self-hosted, linux]
     env:
       SCCACHE_CACHE_SIZE: "50G"
       CARGO_INCREMENTAL: 0
@@ -81,7 +81,7 @@ jobs:
       - name: Run benchmarking tests
         run: make test-benchmarking
   checks-and-tests:
-    runs-on: custom-runner-AWS-Acala
+    runs-on: [self-hosted, linux]
     env:
       SCCACHE_CACHE_SIZE: "50G"
       CARGO_INCREMENTAL: 0
@@ -111,7 +111,7 @@ jobs:
       - name: Check runtimes
         run: make check-runtimes
   e2e-tests:
-    runs-on: custom-runner-AWS-Acala
+    runs-on: [self-hosted, linux]
     env:
       SCCACHE_CACHE_SIZE: "50G"
       CARGO_INCREMENTAL: 0