diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
index 2e3507f..d3a8982 100644
--- a/.github/workflows/default.yaml
+++ b/.github/workflows/default.yaml
@@ -7,9 +7,7 @@ on:
 
 jobs:
   analyze:
-    runs-on:
-    - self-hosted
-    - kaas
+    runs-on: elisa-normal
     timeout-minutes: 15
     permissions:
       id-token: write
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 48a0199..a79ea75 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -9,9 +9,7 @@ on:
 
 jobs:
   analyze:
-    runs-on:
-    - self-hosted
-    - kaas
+    runs-on: elisa-normal
     timeout-minutes: 15
     permissions:
       id-token: write
@@ -46,9 +44,7 @@ jobs:
     permissions:
       pull-requests: write
       contents: write
-    runs-on:
-      - self-hosted
-      - kaas
+    runs-on: elisa-normal
     timeout-minutes: 15
     steps:
       - name: Automerge dependabot PR
diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
index f4978ec..1ecc0da 100644
--- a/.github/workflows/tag.yaml
+++ b/.github/workflows/tag.yaml
@@ -7,9 +7,7 @@ on:
 
 jobs:
   build-release:
-    runs-on:
-    - self-hosted
-    - kaas
+    runs-on: elisa-normal
     timeout-minutes: 5
 
     steps: