diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f1874070719..6743a06cf4f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,8 +10,10 @@ jobs:
     name: Setup
     runs-on: ubuntu-latest
     outputs:
+      compute-tiny: ${{ steps.setup-outputs.outputs.compute-tiny }}
       compute-standard: ${{ steps.setup-outputs.outputs.compute-standard }}
       compute-larger: ${{ steps.setup-outputs.outputs.compute-larger }}
+      compute-huge: ${{ steps.setup-outputs.outputs.compute-huge }}
       enterprise: ${{ steps.setup-outputs.outputs.enterprise }}
       go-build-tags: ${{ steps.setup-outputs.outputs.go-build-tags }}
     steps:
@@ -22,14 +24,18 @@ jobs:
 
         if [ "${github_repository##*/}" == "vault-enterprise" ] ; then
           # shellcheck disable=SC2129
+          echo 'compute-tiny=["self-hosted","ondemand","linux","type=m5.large"]' >> "$GITHUB_OUTPUT"
           echo 'compute-standard=["self-hosted","ondemand","linux","type=m5.xlarge"]' >> "$GITHUB_OUTPUT"
           echo 'compute-larger=["self-hosted","ondemand","linux","type=m5.2xlarge"]' >> "$GITHUB_OUTPUT"
+          echo 'compute-huge=["self-hosted","ondemand","linux","type=m5.4xlarge"]' >> "$GITHUB_OUTPUT"
           echo 'enterprise=1' >> "$GITHUB_OUTPUT"
           echo 'go-build-tags=ent,enterprise' >> "$GITHUB_OUTPUT"
         else
           # shellcheck disable=SC2129
-          echo 'compute-standard=["custom", "linux", "small"]' >> "$GITHUB_OUTPUT"
-          echo 'compute-larger=["custom", "linux", "medium"]' >> "$GITHUB_OUTPUT"
+          echo 'compute-tiny="ubuntu-latest"' >> "$GITHUB_OUTPUT"
+          echo 'compute-standard="custom-linux-xl-vault-latest"' >> "$GITHUB_OUTPUT"
+          echo 'compute-larger="custom-linux-xl-vault-latest"' >> "$GITHUB_OUTPUT"
+          echo 'compute-huge="custom-linux-xl-vault-latest"' >> "$GITHUB_OUTPUT"
           echo 'enterprise=' >> "$GITHUB_OUTPUT"
           echo 'go-build-tags=' >> "$GITHUB_OUTPUT"
         fi
@@ -37,7 +43,7 @@ jobs:
     name: Semgrep
     needs:
     - setup
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-standard) }}
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-tiny) }}
     container:
       image: returntocorp/semgrep@sha256:ffc6f3567654f9431456d49fd059dfe548f007c494a7eb6cd5a1a3e50d813fb3
     steps:
@@ -51,13 +57,13 @@ jobs:
     - setup
     uses: ./.github/workflows/setup-go-cache.yml
     with:
-      runs-on: ${{ needs.setup.outputs.compute-larger }}
+      runs-on: ${{ needs.setup.outputs.compute-standard }}
     secrets: inherit
   fmt:
     name: Check Format
     needs:
     - setup
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-standard) }}
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-tiny) }}
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
     - uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613
@@ -77,7 +83,7 @@ jobs:
     needs:
     - setup
     if: ${{ needs.setup.outputs.enterprise != '' && github.base_ref != '' }}
-    runs-on: ['self-hosted','ondemand','small']
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-tiny) }}
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       with:
@@ -117,7 +123,7 @@ jobs:
       total-runners: 16
       go-arch: amd64
       go-build-tags: '${{ needs.setup.outputs.go-build-tags }},deadlock'
-      runs-on: ${{ needs.setup.outputs.compute-standard }}
+      runs-on: ${{ needs.setup.outputs.compute-larger }}
       enterprise: ${{ needs.setup.outputs.enterprise }}
     secrets: inherit
   test-go-race:
@@ -138,7 +144,7 @@ jobs:
       extra-flags: '-race'
       go-arch: amd64
       go-build-tags: ${{ needs.setup.outputs.go-build-tags }}
-      runs-on: ${{ needs.setup.outputs.compute-larger }}
+      runs-on: ${{ needs.setup.outputs.compute-huge }}
       enterprise: ${{ needs.setup.outputs.enterprise }}
     secrets: inherit
   test-go-fips:
@@ -160,7 +166,7 @@ jobs:
         }
       go-arch: amd64
       go-build-tags: '${{ needs.setup.outputs.go-build-tags }},deadlock,cgo,fips,fips_140_2'
-      runs-on: ${{ needs.setup.outputs.compute-standard }}
+      runs-on: ${{ needs.setup.outputs.compute-larger }}
       enterprise: ${{ needs.setup.outputs.enterprise }}
     secrets: inherit
   test-ui:
@@ -172,7 +178,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-standard) }}
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-larger) }}
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
     - uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613
@@ -261,6 +267,6 @@ jobs:
     - setup
     - test-go
     - test-ui
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-standard) }}
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-tiny) }}
     steps:
     - run: echo "All Go test successfully passed"