diff --git a/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml b/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml
index 680724089cd..67b8f8cd708 100644
--- a/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml
+++ b/.github/workflows/cluster_endtoend_vreplication_migrate_vdiff2_convert_tz.yml
@@ -14,7 +14,8 @@ env:
 jobs:
   build:
     name: Run endtoend tests on Cluster (vreplication_migrate_vdiff2_convert_tz)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped
diff --git a/.github/workflows/cluster_endtoend_vtbackup_transform.yml b/.github/workflows/cluster_endtoend_vtbackup_transform.yml
index bafe0b9e318..fed49f4f9e9 100644
--- a/.github/workflows/cluster_endtoend_vtbackup_transform.yml
+++ b/.github/workflows/cluster_endtoend_vtbackup_transform.yml
@@ -14,7 +14,8 @@ env:
 jobs:
   build:
     name: Run endtoend tests on Cluster (vtbackup_transform)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped
diff --git a/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml
index 580c213327a..3f8e755abd0 100644
--- a/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml
+++ b/.github/workflows/cluster_endtoend_vtgate_partial_keyspace.yml
@@ -14,7 +14,8 @@ env:
 jobs:
   build:
     name: Run endtoend tests on Cluster (vtgate_partial_keyspace)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped
diff --git a/.github/workflows/cluster_endtoend_xb_backup_mysql57.yml b/.github/workflows/cluster_endtoend_xb_backup_mysql57.yml
index eb5d9d3c1e8..d67bd92441f 100644
--- a/.github/workflows/cluster_endtoend_xb_backup_mysql57.yml
+++ b/.github/workflows/cluster_endtoend_xb_backup_mysql57.yml
@@ -18,7 +18,8 @@ env:
 jobs:
   build:
     name: Run endtoend tests on Cluster (xb_backup) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped
diff --git a/.github/workflows/cluster_endtoend_xb_recovery_mysql57.yml b/.github/workflows/cluster_endtoend_xb_recovery_mysql57.yml
index 4ed3f78dd71..d9677d23caa 100644
--- a/.github/workflows/cluster_endtoend_xb_recovery_mysql57.yml
+++ b/.github/workflows/cluster_endtoend_xb_recovery_mysql57.yml
@@ -18,7 +18,8 @@ env:
 jobs:
   build:
     name: Run endtoend tests on Cluster (xb_recovery) mysql57
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
 
     steps:
     - name: Check if workflow needs to be skipped
diff --git a/.github/workflows/endtoend.yml b/.github/workflows/endtoend.yml
index 4deeeb05622..5b4616cf4f6 100644
--- a/.github/workflows/endtoend.yml
+++ b/.github/workflows/endtoend.yml
@@ -4,7 +4,8 @@ jobs:
 
   build:
     name: End-to-End Test
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     steps:
     - name: Check if workflow needs to be skipped
       id: skip-workflow
diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml
index a58cc679c61..35d2e77fff6 100644
--- a/.github/workflows/unit_race.yml
+++ b/.github/workflows/unit_race.yml
@@ -8,7 +8,8 @@ jobs:
 
   build:
     name: Unit Test (Race)
-    runs-on: ubuntu-20.04
+    runs-on:
+      group: vitess-ubuntu20
     steps:
     - name: Check if workflow needs to be skipped
       id: skip-workflow