diff --git a/.github/workflows/ci-go-lint.yml b/.github/workflows/ci-go-lint.yml
index d638d568a..f1378c05f 100644
--- a/.github/workflows/ci-go-lint.yml
+++ b/.github/workflows/ci-go-lint.yml
@@ -50,8 +50,8 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
+          go-version: 1.23.4
           cache-dependency-path: "${{ matrix.dir }}/go.sum"
-          go-version-file: "${{ matrix.dir }}/go.mod"
       - name: Run Linter
         uses: golangci/golangci-lint-action@v6
         with:
diff --git a/.github/workflows/ci-go-test.yml b/.github/workflows/ci-go-test.yml
index bc58eb4ea..3ade3e0b5 100644
--- a/.github/workflows/ci-go-test.yml
+++ b/.github/workflows/ci-go-test.yml
@@ -51,8 +51,8 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
+          go-version: 1.23.4
           cache-dependency-path: "${{ matrix.dir }}/go.sum"
-          go-version-file: "${{ matrix.dir }}/go.mod"
       - name: Run Unit Tests
         run: |
           go install github.com/jstemmer/go-junit-report/v2@latest
diff --git a/.github/workflows/ci-runtime-integration-tests.yml b/.github/workflows/ci-runtime-integration-tests.yml
index 863ab875b..2c354ea83 100644
--- a/.github/workflows/ci-runtime-integration-tests.yml
+++ b/.github/workflows/ci-runtime-integration-tests.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.23
+          go-version: 1.23.4
           cache-dependency-path: runtime/go.sum
       - name: Run Integration Tests
         working-directory: runtime
diff --git a/.github/workflows/ci-sdk-go-build.yml b/.github/workflows/ci-sdk-go-build.yml
index 653f98d44..a7642fc1e 100644
--- a/.github/workflows/ci-sdk-go-build.yml
+++ b/.github/workflows/ci-sdk-go-build.yml
@@ -57,8 +57,8 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
+          go-version: 1.23.4
           cache-dependency-path: ./sdk/go/go.sum
-          go-version-file: ./sdk/go/go.mod
       - name: Build Program
         run: go build .
 
@@ -78,8 +78,8 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
+          go-version: 1.23.4
           cache-dependency-path: "${{ matrix.dir }}/go.sum"
-          go-version-file: "${{ matrix.dir }}/go.mod"
       - name: Setup TinyGo
         uses: acifani/setup-tinygo@v2
         with:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 4768adcc8..862081a82 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -67,7 +67,7 @@ jobs:
         if: matrix.language == 'go'
         uses: actions/setup-go@v5
         with:
-          go-version-file: runtime/go.mod
+          go-version: 1.23.4
           cache-dependency-path: runtime/go.sum
 
       # Initializes the CodeQL tools for scanning.
diff --git a/.github/workflows/release-runtime.yaml b/.github/workflows/release-runtime.yaml
index 40579f714..8cc16567c 100644
--- a/.github/workflows/release-runtime.yaml
+++ b/.github/workflows/release-runtime.yaml
@@ -32,8 +32,7 @@ jobs:
         run: npm run build
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.23
-          check-latest: true
+          go-version: 1.23.4
           cache-dependency-path: runtime/go.sum
       - uses: goreleaser/goreleaser-action@v6
         with:
diff --git a/.github/workflows/release-sdk-go.yaml b/.github/workflows/release-sdk-go.yaml
index 091fd7c30..bf8cbb6c7 100644
--- a/.github/workflows/release-sdk-go.yaml
+++ b/.github/workflows/release-sdk-go.yaml
@@ -26,8 +26,8 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
+          go-version: 1.23.4
           cache-dependency-path: ./sdk/go/go.sum
-          go-version-file: ./sdk/go/go.mod
       - name: Prepare Release
         working-directory: sdk/go
         run: ./scripts/prepare-release.sh ${{ steps.parse_sdk_version.outputs.sdk_version }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d96a86a29..10ec414cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - chore: add timezone header to api explorer [#672](https://github.com/hypermodeinc/modus/pull/672)
 - fix: reimplement DynamicMap parsing [#678](https://github.com/hypermodeinc/modus/pull/678)
   [#681](https://github.com/hypermodeinc/modus/pull/681)
+- chore: use `toolchain` to set Go version [#684](https://github.com/hypermodeinc/modus/pull/684)
 
 ## 2025-01-06 - CLI 0.16.2
 
diff --git a/go.work b/go.work
index dd7759c67..94d46dc62 100644
--- a/go.work
+++ b/go.work
@@ -1,4 +1,6 @@
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 use (
 	./lib/manifest
diff --git a/lib/manifest/go.mod b/lib/manifest/go.mod
index ca697fa2b..d284dc169 100644
--- a/lib/manifest/go.mod
+++ b/lib/manifest/go.mod
@@ -1,6 +1,8 @@
 module github.com/hypermodeinc/modus/lib/manifest
 
-go 1.23
+go 1.23.1
+
+toolchain go1.23.4
 
 require (
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
diff --git a/lib/metadata/go.mod b/lib/metadata/go.mod
index 756a5938a..1d5549758 100644
--- a/lib/metadata/go.mod
+++ b/lib/metadata/go.mod
@@ -1,6 +1,8 @@
 module github.com/hypermodeinc/modus/lib/metadata
 
-go 1.23
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/lib/wasmextractor v0.13.0
 
diff --git a/lib/wasmextractor/go.mod b/lib/wasmextractor/go.mod
index b80af4edd..69ba161a3 100644
--- a/lib/wasmextractor/go.mod
+++ b/lib/wasmextractor/go.mod
@@ -1,3 +1,5 @@
 module github.com/hypermodeinc/modus/lib/wasmextractor
 
-go 1.23
+go 1.23.1
+
+toolchain go1.23.4
diff --git a/runtime/go.mod b/runtime/go.mod
index e097a440d..533c605e8 100644
--- a/runtime/go.mod
+++ b/runtime/go.mod
@@ -1,6 +1,8 @@
 module github.com/hypermodeinc/modus/runtime
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require (
 	github.com/hypermodeinc/modus/lib/manifest v0.15.0
diff --git a/runtime/languages/golang/testdata/go.mod b/runtime/languages/golang/testdata/go.mod
index a11233ed8..4bc7212b2 100644
--- a/runtime/languages/golang/testdata/go.mod
+++ b/runtime/languages/golang/testdata/go.mod
@@ -1,5 +1,7 @@
 module testdata
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/anthropic-functions/go.mod b/sdk/go/examples/anthropic-functions/go.mod
index e9472a1e4..3ae699141 100644
--- a/sdk/go/examples/anthropic-functions/go.mod
+++ b/sdk/go/examples/anthropic-functions/go.mod
@@ -1,6 +1,8 @@
 module anthropic-functions-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
 
diff --git a/sdk/go/examples/auth/go.mod b/sdk/go/examples/auth/go.mod
index 6a2bf35bb..1ee82dd26 100644
--- a/sdk/go/examples/auth/go.mod
+++ b/sdk/go/examples/auth/go.mod
@@ -1,5 +1,7 @@
 module auth-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/classification/go.mod b/sdk/go/examples/classification/go.mod
index 054f35915..3e27747e3 100644
--- a/sdk/go/examples/classification/go.mod
+++ b/sdk/go/examples/classification/go.mod
@@ -1,5 +1,7 @@
 module classification-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/collections/go.mod b/sdk/go/examples/collections/go.mod
index aad8fd99c..3ce41f892 100644
--- a/sdk/go/examples/collections/go.mod
+++ b/sdk/go/examples/collections/go.mod
@@ -1,5 +1,7 @@
 module collection-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/dgraph/go.mod b/sdk/go/examples/dgraph/go.mod
index aa58b2299..472ea8992 100644
--- a/sdk/go/examples/dgraph/go.mod
+++ b/sdk/go/examples/dgraph/go.mod
@@ -1,5 +1,7 @@
 module dgraph-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/embedding/go.mod b/sdk/go/examples/embedding/go.mod
index a0edbf0e1..16fcbf5b8 100644
--- a/sdk/go/examples/embedding/go.mod
+++ b/sdk/go/examples/embedding/go.mod
@@ -1,6 +1,8 @@
 module embedding-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
 
diff --git a/sdk/go/examples/graphql/go.mod b/sdk/go/examples/graphql/go.mod
index 129f40f0d..2cee54924 100644
--- a/sdk/go/examples/graphql/go.mod
+++ b/sdk/go/examples/graphql/go.mod
@@ -1,5 +1,7 @@
 module graphql-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/http/go.mod b/sdk/go/examples/http/go.mod
index 130e9bb35..063a38dbd 100644
--- a/sdk/go/examples/http/go.mod
+++ b/sdk/go/examples/http/go.mod
@@ -1,5 +1,7 @@
 module http-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/neo4j/go.mod b/sdk/go/examples/neo4j/go.mod
index c571fd3d4..53c14adc5 100644
--- a/sdk/go/examples/neo4j/go.mod
+++ b/sdk/go/examples/neo4j/go.mod
@@ -1,5 +1,7 @@
 module neo4j-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/postgresql/go.mod b/sdk/go/examples/postgresql/go.mod
index 09d03c097..6e71e58aa 100644
--- a/sdk/go/examples/postgresql/go.mod
+++ b/sdk/go/examples/postgresql/go.mod
@@ -1,5 +1,7 @@
 module postgresql-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/simple/go.mod b/sdk/go/examples/simple/go.mod
index aa9c68dff..ae07fe3d7 100644
--- a/sdk/go/examples/simple/go.mod
+++ b/sdk/go/examples/simple/go.mod
@@ -1,5 +1,7 @@
 module simple-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/textgeneration/go.mod b/sdk/go/examples/textgeneration/go.mod
index e1228f1db..9195c9123 100644
--- a/sdk/go/examples/textgeneration/go.mod
+++ b/sdk/go/examples/textgeneration/go.mod
@@ -1,6 +1,8 @@
 module text-generation-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
 
diff --git a/sdk/go/examples/time/go.mod b/sdk/go/examples/time/go.mod
index 432358146..07df89052 100644
--- a/sdk/go/examples/time/go.mod
+++ b/sdk/go/examples/time/go.mod
@@ -1,5 +1,7 @@
 module time-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
diff --git a/sdk/go/examples/vectors/go.mod b/sdk/go/examples/vectors/go.mod
index a9f5a4420..0ae29fc94 100644
--- a/sdk/go/examples/vectors/go.mod
+++ b/sdk/go/examples/vectors/go.mod
@@ -1,6 +1,8 @@
 module vectors-example
 
-go 1.23.4
+go 1.23.1
+
+toolchain go1.23.4
 
 require github.com/hypermodeinc/modus/sdk/go v0.16.0
 
diff --git a/sdk/go/go.mod b/sdk/go/go.mod
index 549b5a211..1cf094565 100644
--- a/sdk/go/go.mod
+++ b/sdk/go/go.mod
@@ -2,6 +2,8 @@ module github.com/hypermodeinc/modus/sdk/go
 
 go 1.23.1
 
+toolchain go1.23.4
+
 require (
 	github.com/hypermodeinc/modus/lib/manifest v0.15.0
 	github.com/hypermodeinc/modus/lib/wasmextractor v0.13.0
diff --git a/sdk/go/templates/default/go.mod b/sdk/go/templates/default/go.mod
index 4e5079411..e615dc772 100644
--- a/sdk/go/templates/default/go.mod
+++ b/sdk/go/templates/default/go.mod
@@ -2,4 +2,6 @@ module my-modus-app
 
 go 1.23.1
 
+toolchain go1.23.4
+
 require github.com/hypermodeinc/modus/sdk/go v0.16.0