diff --git a/Makefile b/Makefile
index 21e8697974..ba48ebe306 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ else
 endif
 export TERM := linux-m
 export GO111MODULE := on
-export GOTOOLCHAIN := local
+export GOTOOLCHAIN := local+auto
 export ATLAS_E2E_BINARY
 
 .PHONY: pre-commit
diff --git a/go.mod b/go.mod
index 5e100ebdbf..1a24ad315d 100644
--- a/go.mod
+++ b/go.mod
@@ -2,6 +2,8 @@ module github.com/mongodb/mongodb-atlas-cli/atlascli
 
 go 1.23.1
 
+toolchain go1.23.0
+
 require (
 	cloud.google.com/go/kms v1.20.0
 	github.com/AlecAivazis/survey/v2 v2.3.7