diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml
index e8461282e0..372baa8288 100644
--- a/.github/workflows/iso.yml
+++ b/.github/workflows/iso.yml
@@ -7,7 +7,7 @@ env:
   GOPROXY: https://proxy.golang.org
 jobs:
   build_test_iso:
-    runs-on: [self-hosted, debian9, gcp]
+    runs-on: [self-hosted, debian9, baremetal, equinix]
     steps:
       - name: Clean up workspace
         shell: bash
diff --git a/.github/workflows/kic_image.yml b/.github/workflows/kic_image.yml
index 373914c583..65a826627d 100644
--- a/.github/workflows/kic_image.yml
+++ b/.github/workflows/kic_image.yml
@@ -7,7 +7,7 @@ env:
   GOPROXY: https://proxy.golang.org
 jobs:
   build_test_kic_image:
-    runs-on: [self-hosted, debian9, gcp]
+    runs-on: [self-hosted, debian9, baremetal, equinix]
     steps:
       - name: Clean up 
         shell: bash