diff --git a/.github/resources/actionlint.yaml b/.github/resources/actionlint.yaml
index 762f315bf..2259f6c00 100644
--- a/.github/resources/actionlint.yaml
+++ b/.github/resources/actionlint.yaml
@@ -4,7 +4,7 @@
 
 self-hosted-runner:
   # Labels of self-hosted runner in array of strings.
-  labels: [xeon, nuc]
+  labels: [all, bat]
 
 # Configuration variables in array of strings defined in your repository or
 # organization. `null` means disabling configuration variables check.
diff --git a/.github/workflows/tests-all.yml b/.github/workflows/tests-all.yml
index b6596d7a4..14ff009ff 100644
--- a/.github/workflows/tests-all.yml
+++ b/.github/workflows/tests-all.yml
@@ -19,7 +19,7 @@ on:
         description: "Timeout for the job in minutes"
         required: false
         type: number
-        default: 90
+        default: 120
   push:
     branches:
       - main
@@ -45,7 +45,7 @@ permissions:
 jobs:
   run-all-tests:
     name: "Run All Tests"
-    runs-on: [self-hosted]
+    runs-on: [all]
     timeout-minutes: ${{ fromJSON(inputs.timeout || '90') }}
     steps:
       - name: "Remove all Docker images"
diff --git a/.github/workflows/tests-bat.yml b/.github/workflows/tests-bat.yml
index f0d5cde85..44554a8a0 100644
--- a/.github/workflows/tests-bat.yml
+++ b/.github/workflows/tests-bat.yml
@@ -116,7 +116,7 @@ jobs:
 
   run-basic-acceptance-tests:
     name: "Run Basic Acceptance Tests"
-    runs-on: [self-hosted]
+    runs-on: [bat]
     timeout-minutes: ${{ fromJSON(inputs.timeout || '60') }}
     needs: [filter, check-pr-state]
     if: ${{ needs.filter.outputs.code_changed == 'true' && (needs.check-pr-state.outputs.pr_state != 'true' || github.event_name == 'workflow_dispatch') }}