diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index b484d323fa..bf1a5420b3 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -37,10 +37,13 @@ jobs:
     needs: 
     - setup
     uses: ./.github/workflows/reusable-check-go-mod.yml
+    with:
+      runs-on: ${{ needs.setup.outputs.compute-medium }}
+    
   check-generated-protobuf:
     needs: 
     - setup   
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
     - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
@@ -64,7 +67,7 @@ jobs:
   check-generated-deep-copy:
     needs: 
     - setup   
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
     - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
@@ -84,7 +87,7 @@ jobs:
   lint-enums:
     needs: 
     - setup   
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
     - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
@@ -98,7 +101,7 @@ jobs:
   lint-container-test-deps:
     needs: 
     - setup   
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
     - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
@@ -112,7 +115,7 @@ jobs:
   lint-consul-retry:
     needs: 
     - setup   
-    runs-on: ubuntu-latest
+    runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     steps:
     - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0
     - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # pin@v3.5.0
@@ -127,6 +130,8 @@ jobs:
     needs: 
     - setup   
     uses: ./.github/workflows/reusable-lint.yml
+    with:
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
 
   lint-32bit:
     needs: 
@@ -134,13 +139,17 @@ jobs:
     uses: ./.github/workflows/reusable-lint.yml
     with:
       go-arch: "386"
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
+    
 
   # create a development build
   dev-build:
     needs: 
     - setup   
     uses: ./.github/workflows/reusable-dev-build.yml
-
+    with: 
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
+    
   # TODO(JM): - linux arm64 is not available in our self-hosted runners
   #             they are currently on the roadmap.
   # # create a development build for arm64
@@ -150,7 +159,7 @@ jobs:
   #   uses: ./.github/workflows/reusable-dev-build.yml
   #   with:
   #     uploaded-binary-name: 'consul-bin-arm64'
-  #     # runs-on: ${{ needs.setup.outputs.compute-arm64 }}
+  #     # runs-on: ${{ needs.setup.outputs.compute-xl-arm64 }}
 
   # go-test-arm64:
   #   # TODO(JM):  Fix to run on arm64
@@ -163,7 +172,7 @@ jobs:
   #     go-version: "1.20"
   #     uploaded-binary-name: 'consul-bin-arm64'
   #     runner-count: 12
-  #     # runs-on: ${{ needs.setup.outputs.compute-arm64 }}
+  #     # runs-on: ${{ needs.setup.outputs.compute-xl-arm64 }}
   #     go-test-flags: 'if ! [[ "$GITHUB_REF_NAME" =~ ^main$|^release/ ]]; then export GO_TEST_FLAGS="-short"; fi'
 
   go-test:
@@ -175,6 +184,8 @@ jobs:
       directory: .
       go-version: "1.20"
       runner-count: 12
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
+    
 
   go-test-race:
     needs: 
@@ -186,6 +197,7 @@ jobs:
       go-version: "1.20"
       go-test-flags: 'GO_TEST_FLAGS="-race -gcflags=all=-d=checkptr=0"'
       package-names-command: "go list ./... | grep -E -v '^github.com/hashicorp/consul/agent(/consul|/local|/routine-leak-checker)?$' | grep -E -v '^github.com/hashicorp/consul/command/'"
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
 
   go-test-32bit:
     needs: 
@@ -197,6 +209,7 @@ jobs:
       go-version: "1.20"
       go-arch: "386"
       go-test-flags: 'export GO_TEST_FLAGS="-short"'
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
 
   go-test-envoyextensions:
     needs: 
@@ -206,6 +219,7 @@ jobs:
     with:
       directory: envoyextensions
       go-version: "1.20"
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
 
   go-test-troubleshoot:
     needs: 
@@ -215,6 +229,7 @@ jobs:
     with:
       directory: troubleshoot
       go-version: "1.20"
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
 
   go-test-api-1-19:
     needs: 
@@ -224,6 +239,7 @@ jobs:
     with:
       directory: api
       go-version: "1.19"
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
 
   go-test-api-1-20:
     needs: 
@@ -233,6 +249,7 @@ jobs:
     with:
       directory: api
       go-version: "1.20"
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
 
   go-test-sdk-1-19:
     needs: 
@@ -242,6 +259,7 @@ jobs:
     with:
       directory: sdk
       go-version: "1.19"
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
 
   go-test-sdk-1-20:
     needs: 
@@ -251,6 +269,7 @@ jobs:
     with:
       directory: sdk
       go-version: "1.20"
+      runs-on: ${{ needs.setup.outputs.compute-xl }}
 
   noop:
     runs-on: ubuntu-latest