diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc7fa5753ce..6d1a42ebca2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,9 +25,8 @@ jobs:
       ebs_cache_size_gb: 256
       runner_concurrency: 20
       subaction: ${{ inputs.runner_action || 'start' }}
-      # This instance list has a spot placement score of 9/10. Note we used to just use m6a.32xlarge, which had a score of 1!
-      # https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#SpotPlacementScore:
-      ec2_instance_type: i4i.32xlarge m6a.32xlarge m6i.32xlarge m6id.32xlarge m6idn.32xlarge m6in.32xlarge m7a.32xlarge r6a.32xlarge r6i.32xlarge r6id.32xlarge
+      # Use instance types with low interruption rate in us-east-2 https://aws.amazon.com/ec2/spot/instance-advisor/
+      ec2_instance_type: r6in.32xlarge r6a.32xlarge i4i.32xlarge r7iz.32xlarge
       ec2_ami_id: ami-04d8422a9ba4de80f
       ec2_spot_instance_strategy: BestEffort
       ec2_instance_ttl: 40 # refreshed by jobs
diff --git a/.github/workflows/start-spot.yml b/.github/workflows/start-spot.yml
index 539567f08cb..b4ed1f3ca1b 100644
--- a/.github/workflows/start-spot.yml
+++ b/.github/workflows/start-spot.yml
@@ -18,7 +18,8 @@ jobs:
       ebs_cache_size_gb: 256
       runner_concurrency: 20
       subaction: ${{ inputs.action }}
-      ec2_instance_type: m6a.32xlarge
+      # Use instance types with low interruption rate in us-east-2 https://aws.amazon.com/ec2/spot/instance-advisor/
+      ec2_instance_type: r6in.32xlarge r6a.32xlarge i4i.32xlarge r7iz.32xlarge
       ec2_ami_id: ami-04d8422a9ba4de80f
       ec2_instance_ttl: 40 # refreshed by jobs
     secrets: inherit
diff --git a/.github/workflows/stop-spot.yml b/.github/workflows/stop-spot.yml
deleted file mode 100644
index 750fca5a523..00000000000
--- a/.github/workflows/stop-spot.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Useful if the spot runners are in a bad state
-name: Stop Personal Spot
-on:
-  workflow_dispatch: {}
-jobs:
-  stop-build-x86:
-    uses: ./.github/workflows/setup-runner.yml
-    with:
-      runner_label: ${{ github.actor }}-x86
-      subaction: stop
-      # not used:
-      ebs_cache_size_gb: 128
-      runner_concurrency: 20
-      ec2_instance_type: m6a.32xlarge
-      ec2_ami_id: ami-0d8a9b0419ddb331a
-      ec2_instance_ttl: 40
-    secrets: inherit
-
-  stop-bench:
-    uses: ./.github/workflows/setup-runner.yml
-    with:
-      runner_label: ${{ github.actor }}-bench-x86
-      subaction: stop
-      # not used:
-      ebs_cache_size_gb: 32
-      runner_concurrency: 1
-      ec2_instance_type: m6a.4xlarge
-      ec2_ami_id: ami-0d8a9b0419ddb331a
-      ec2_instance_ttl: 15
-    secrets: inherit
\ No newline at end of file