diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
index b0c80a4afb3..c8cc93f9c7b 100644
--- a/.github/workflows/ci-core.yml
+++ b/.github/workflows/ci-core.yml
@@ -88,15 +88,19 @@ jobs:
         type:
           - cmd: go_core_tests
             id: core_unit
+            os: ubuntu22.04-32cores-128GB
           - cmd: go_core_race_tests
             id: core_race
+            # use 64cores for overnight runs only due to massive number of runs from PRs
+            os: ${{ github.event_name == 'schedule' && 'ubuntu-latest-64cores-256GB' || 'ubuntu-latest-32cores-128GB' }}
           - cmd: go_core_fuzz
             id: core_fuzz
+            os: ubuntu22.04-8cores-32GB
     name: Core Tests (${{ matrix.type.cmd }})
     # We don't directly merge dependabot PRs, so let's not waste the resources
     if: github.actor != 'dependabot[bot]'
     needs: [filter]
-    runs-on: ubuntu-latest-64cores-256GB
+    runs-on: ${{ matrix.type.os }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -111,9 +115,6 @@ jobs:
       - name: Setup Go
         if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-go
-      - name: Run short tests
-        if: ${{ needs.filter.outputs.changes == 'true' && matrix.type.cmd == 'go_core_tests' }}
-        run: go test -short ./...
       - name: Setup Solana
         if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-solana