diff --git a/.github/workflows/buildAndTestRyzenAI.yml b/.github/workflows/buildAndTestRyzenAI.yml
index bbd0c4cae3..797cb2b6e9 100644
--- a/.github/workflows/buildAndTestRyzenAI.yml
+++ b/.github/workflows/buildAndTestRyzenAI.yml
@@ -55,7 +55,7 @@ env:
 jobs:
   build-tests:
     name: Run Tests on Ryzen AI
-    runs-on: amd8700g
+    runs-on: amd7940hs
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/buildRyzenWheels.yml b/.github/workflows/buildRyzenWheels.yml
index 4dce2a9020..2116c16167 100644
--- a/.github/workflows/buildRyzenWheels.yml
+++ b/.github/workflows/buildRyzenWheels.yml
@@ -28,7 +28,7 @@ jobs:
   build-repo:
     name: Build and upload mlir_aie wheels
 
-    runs-on: amd8700g
+    runs-on: amd7940hs
 
     permissions:
       id-token: write
@@ -104,7 +104,7 @@ jobs:
   build-wheel:
     name: Build wheel
 
-    runs-on: amd8700g
+    runs-on: amd7940hs
 
     needs: build-repo