diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb3cfb9b61f..e05d440eafc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,8 +23,9 @@ jobs:
       runner_label: ${{ github.actor }}-x86
       ebs_cache_size_gb: 128
       runner_concurrency: 50
+      subaction: ${{ github.event.inputs.runner_action || 'start' }}
       ec2_instance_type: m6a.32xlarge
-      ec2_ami_id: ami-0d8a9b0419ddb331a
+      ec2_ami_id: ami-04d8422a9ba4de80f
       ec2_instance_ttl: 40 # refreshed by jobs
     secrets: inherit
 
@@ -70,7 +71,7 @@ jobs:
           concurrency_key: e2e-${{ github.actor }}-x86-${{ matrix.test }}
       - name: Test
         working-directory: ./yarn-project/end-to-end/
-        timeout-minutes: 15
+        timeout-minutes: 25
         run: earthly -P --no-output +${{ matrix.test }} --e2e_mode=cache
       # TODO
       # - name: Upload logs
@@ -111,7 +112,7 @@ jobs:
           concurrency_key: bb-bench-binaries-${{ github.actor }}-x86
       - name: Build and Push Binaries
         if: ${{ github.event.inputs.just_start_spot != 'true' }}
-        timeout-minutes: 25
+        timeout-minutes: 15
         working-directory: ./barretenberg/cpp/
         run: earthly --push +bench-binaries
 
@@ -122,8 +123,9 @@ jobs:
       runner_label: ${{ github.actor }}-bench-x86
       ebs_cache_size_gb: 32
       runner_concurrency: 1
+      subaction: ${{ github.event.inputs.runner_action || 'start' }}
       ec2_instance_type: m6a.4xlarge
-      ec2_ami_id: ami-0d8a9b0419ddb331a
+      ec2_ami_id: ami-04d8422a9ba4de80f
       ec2_instance_ttl: 15 # refreshed by jobs
     secrets: inherit
 
@@ -148,7 +150,7 @@ jobs:
       - name: Ultrahonk Bench
         working-directory: ./barretenberg/cpp/
         timeout-minutes: 15
-        run: earthly --no-output +bench-ulAtra-honk --bench_mode=cache
+        run: earthly --no-output +bench-ultra-honk --bench_mode=cache
 
   # # Post actions, deploy and summarize logs
   # aztec-bench-summary:
diff --git a/.github/workflows/setup-runner.yml b/.github/workflows/setup-runner.yml
index 8bfc3f15527..46d9c68f160 100644
--- a/.github/workflows/setup-runner.yml
+++ b/.github/workflows/setup-runner.yml
@@ -37,6 +37,9 @@ on:
       ebs_cache_size_gb:
         required: true
         type: string
+      subaction:
+        required: true
+        type: string
     secrets:
       AWS_ACCESS_KEY_ID:
         required: true
@@ -61,6 +64,7 @@ jobs:
           ec2_security_group_id: ${{ inputs.ec2_security_group_id }}
           ec2_spot_instance_strategy: ${{ inputs.ec2_spot_instance_strategy }}
           runner_label: ${{ inputs.runner_label }}
+          subaction: ${{inputs.subaction }}
           runner_concurrency: ${{ inputs.runner_concurrency }}
           ec2_instance_type: ${{ inputs.ec2_instance_type }}
           ec2_ami_id: ${{ inputs.ec2_ami_id }}
diff --git a/.github/workflows/stop-spot.yml b/.github/workflows/stop-spot.yml
new file mode 100644
index 00000000000..bccacb313fd
--- /dev/null
+++ b/.github/workflows/stop-spot.yml
@@ -0,0 +1,43 @@
+# Useful if the spot runners are in a bad state
+name: Stop Personal Spot
+on:
+  workflow_dispatch: {}
+jobs:
+  stop-build-arm:
+    uses: ./.github/workflows/setup-runner.yml
+    with:
+      runner_label: ${{ github.actor }}-arm
+      subaction: stop
+      # not used:
+      ebs_cache_size_gb: 128
+      runner_concurrency: 8
+      ec2_instance_type: r6g.16xlarge
+      ec2_ami_id: ami-0d8a9b0419ddb331a
+      ec2_instance_ttl: 40
+    secrets: inherit
+
+  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: 50
+      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