diff --git a/Makefile b/Makefile
index 41582736ce..5a41e77bc2 100644
--- a/Makefile
+++ b/Makefile
@@ -348,6 +348,7 @@ vendor:
 	$(GO) mod tidy
 	$(GO) mod vendor
 	$(GO) mod verify
+	$(GO) mod edit -toolchain none
 
 
 # We define *-in-container targets for the following make targets. This allow the targets to be run in a container.
diff --git a/go.mod b/go.mod
index c8795da1ce..a3b13b34e4 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,7 @@
 module github.com/containers/podman/v5
 
-// Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates
+// Warning: if there is a "toolchain" directive anywhere in this file (and most of the
+// time there shouldn't be), its version must be an exact match to the "go" directive.
 
 go 1.22.6
 
diff --git a/test/tools/Makefile b/test/tools/Makefile
index 810f5e6145..ea128cf433 100644
--- a/test/tools/Makefile
+++ b/test/tools/Makefile
@@ -12,6 +12,7 @@ vendor:
 	$(GO) mod tidy
 	$(GO) mod vendor
 	$(GO) mod verify
+	$(GO) mod edit -toolchain none
 
 .PHONY: clean
 clean:
diff --git a/test/tools/go.mod b/test/tools/go.mod
index c2bce0ec5c..12460503ac 100644
--- a/test/tools/go.mod
+++ b/test/tools/go.mod
@@ -1,5 +1,8 @@
 module github.com/containers/podman/test/tools
 
+// Warning: if there is a "toolchain" directive anywhere in this file (and most of the
+// time there shouldn't be), its version must be an exact match to the "go" directive.
+
 go 1.22.0
 
 require (