diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 9a3fccf05e..5b58bccb44 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -36,6 +36,7 @@ jobs:
     timeout-minutes: 30
     runs-on: 
       group: namada-runners
+      labels: ubuntu-22-small
     container: 
       image: ghcr.io/anoma/namada:wasm-main
     strategy:
@@ -93,6 +94,7 @@ jobs:
     timeout-minutes: 30
     runs-on: 
       group: namada-runners
+      labels: ubuntu-22-small
     needs: [build-wasm]
     container: 
       image: ghcr.io/anoma/namada:wasm-main
@@ -188,6 +190,7 @@ jobs:
   test-unit:
     runs-on: 
       group: namada-runners
+      labels: ubuntu-22-small
     timeout-minutes: 30
     needs: [build-wasm]
     strategy:
@@ -285,6 +288,7 @@ jobs:
   test-integration:
     runs-on: 
       group: namada-runners
+      labels: ubuntu-22-small
     timeout-minutes: 30
     needs: [build-wasm]
     strategy:
@@ -374,6 +378,7 @@ jobs:
   run-benchmarks:
     runs-on: 
       group: namada-runners
+      labels: ubuntu-22
     timeout-minutes: 60
     needs: [build-wasm]
     strategy:
@@ -462,6 +467,7 @@ jobs:
   namada-release:
     runs-on: 
       group: namada-runners
+      labels: ubuntu-22
     timeout-minutes: 40
     strategy:
       fail-fast: false
@@ -562,6 +568,7 @@ jobs:
   namada-e2e:
     runs-on: 
       group: namada-runners
+      labels: ubuntu-22-small
     needs: [build-wasm, namada-release]
     # timeout-minutes: 80
     strategy:
@@ -576,6 +583,8 @@ jobs:
           - index: 1
           - index: 2
           - index: 3
+          - index: 4
+          - index: 5
 
     env:
       RUSTC_WRAPPER: sccache
diff --git a/.github/workflows/scripts/schedule-e2e.py b/.github/workflows/scripts/schedule-e2e.py
index b207377e40..87e8feef33 100644
--- a/.github/workflows/scripts/schedule-e2e.py
+++ b/.github/workflows/scripts/schedule-e2e.py
@@ -3,7 +3,7 @@
 import subprocess
 import sys
 
-N_OF_MACHINES = 4
+N_OF_MACHINES = 6
 
 NIGHTLY_VERSION = open("rust-nightly-version", "r").read().strip()