diff --git a/Makefile b/Makefile
index 7c835ee..8e2697f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,8 @@
 # The docker image to use for the build environment.  Changing this
 # will force a rebuild of the docker image.  If there is an existing image
 # with this name, it will be used.
-DOCKER_IMAGE=tailscale-android-build-amd64
+DOCKER_IMAGE=tailscale-android-build-amd64-go1.23
+export TS_USE_TOOLCHAIN=1
 
 DEBUG_APK=tailscale-debug.apk
 RELEASE_AAB=tailscale-release.aab
diff --git a/go.mod b/go.mod
index 132633e..060310f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,6 @@
 module github.com/tailscale/tailscale-android
 
-go 1.23
-
-toolchain go1.23.0
+go 1.23.0
 
 require (
 	github.com/tailscale/wireguard-go v0.0.0-20240731203015-71393c576b98
diff --git a/version/tailscale-version.sh b/version/tailscale-version.sh
index 16ce7ee..adc01dc 100755
--- a/version/tailscale-version.sh
+++ b/version/tailscale-version.sh
@@ -9,6 +9,9 @@
 
 set -euo pipefail
 
+# use the go toolchain from the tailscale.com
+export TS_USE_TOOLCHAIN=1
+
 go_list=$(go list -m tailscale.com)
 # go list outputs `tailscale.com <version>`. Extract the version.
 mod_version=${go_list#tailscale.com}