diff --git a/Dockerfile b/Dockerfile
index 2639d91e44..d30e6a2c48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,10 @@ ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS="bindata timetzdata $TAGS"
 ARG CGO_EXTRA_CFLAGS
 
+# it's set to local by default in the base image
+# we want to use auto to let go choose the right toolchain
+ENV GOTOOLCHAIN=auto
+
 #
 # Transparently cross compile for the target platform
 #
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
index d6e037c522..71d1e8b789 100644
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -10,6 +10,10 @@ ARG TAGS="sqlite sqlite_unlock_notify"
 ENV TAGS="bindata timetzdata $TAGS"
 ARG CGO_EXTRA_CFLAGS
 
+# it's set to local by default in the base image
+# we want to use auto to let go choose the right toolchain
+ENV GOTOOLCHAIN=auto
+
 #
 # Transparently cross compile for the target platform
 #