diff --git a/cmd/release/release.go b/cmd/release/release.go
index f947eb5..0afa475 100644
--- a/cmd/release/release.go
+++ b/cmd/release/release.go
@@ -164,7 +164,7 @@
 var builds = []*Build{
 	{
 		Source:  true,
-		Builder: "linux-amd64",
+		Builder: "linux-amd64-jessie", // using Jessie for at least [Go 1.11, Go 1.13] due to golang.org/issue/31336
 	},
 	{
 		OS:      "linux",
diff --git a/dashboard/builders.go b/dashboard/builders.go
index 5a19ab1..0b1458a 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1540,10 +1540,10 @@
 		Notes: "Runs GOOS=linux but with the Android emulator attached, for running x/mobile host tests.",
 	})
 	addBuilder(BuildConfig{
-		Name:      "linux-amd64-stretch",
-		HostType:  "host-linux-stretch",
-		MaxAtOnce: 1,
-		Notes:     "Debian Stretch",
+		Name:      "linux-amd64-jessie",
+		HostType:  "host-linux-jessie",
+		MaxAtOnce: 5,
+		Notes:     "Debian Jessie. The normal 'linux-amd64' builder is stretch. We use Jessie for our release builds due to https://golang.org/issue/31293",
 		env: []string{
 			"GO_DISABLE_OUTBOUND_NETWORK=1",
 		},