diff --git a/.github/workflows/build-cli.yaml b/.github/workflows/build-cli.yaml
index ba03220a..7af7214c 100644
--- a/.github/workflows/build-cli.yaml
+++ b/.github/workflows/build-cli.yaml
@@ -51,8 +51,13 @@ jobs:
 
       - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
-          go-version: '1.23'
+          # This job runs the e2e module (go 1.24); install the Go it declares
+          # so `go test` doesn't hard-fail under GOTOOLCHAIN=local with
+          # "go.mod requires go >= 1.24.0". The root build job above stays on
+          # the root go.mod's 1.23.
+          go-version-file: e2e/go.mod
           cache: true
+          cache-dependency-path: e2e/go.sum
 
       - name: Run E2E tests
         working-directory: e2e
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index aab231a3..1eb0c8af 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -48,8 +48,14 @@ jobs:
 
       - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
-          go-version: '1.23'
+          # The e2e module declares its own toolchain (go 1.24). Drive the
+          # installed Go straight from e2e/go.mod so the runner always matches
+          # the module requirement. Pinning a literal version here drifts: when
+          # it lags the module's `go` directive, `go test` fails immediately
+          # under GOTOOLCHAIN=local with "go.mod requires go >= 1.24.0".
+          go-version-file: e2e/go.mod
           cache: true
+          cache-dependency-path: e2e/go.sum
 
       - name: Show runner resources
         run: |