diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6c968053..9648b254 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -28,7 +28,7 @@ jobs:
       group: ${{ github.workflow }}-build-and-push-image-${{ inputs.hardware }}-${{ github.head_ref || github.run_id }}
       cancel-in-progress: true
     runs-on:
-      group: aws-r7i-8xlarge-priv
+      group: aws-r6id-8xlarge-priv
     permissions:
       contents: write
       packages: write
@@ -49,7 +49,7 @@ jobs:
                 export dockerfile="Dockerfile"
                 export label_extension=""
                 export docker_devices=""
-                export runs_on="aws-g5-12xlarge"
+                export runs_on="aws-g6-12xlarge"
                 ;;
             rocm)
                 export dockerfile="Dockerfile_amd"