diff --git a/dashboard/builders.go b/dashboard/builders.go
index 02b1eca..c1425e6 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -1339,7 +1339,7 @@
 	})
 	addBuilder(BuildConfig{
 		Name:     "linux-amd64",
-		HostType: "host-linux-jessie",
+		HostType: "host-linux-stretch",
 		tryBot:   defaultTrySet(),
 		env: []string{
 			"GO_DISABLE_OUTBOUND_NETWORK=1",
diff --git a/env/linux-x86-stretch/Dockerfile b/env/linux-x86-stretch/Dockerfile
index 67e3440..50003f0 100644
--- a/env/linux-x86-stretch/Dockerfile
+++ b/env/linux-x86-stretch/Dockerfile
@@ -39,6 +39,7 @@
 	mercurial \
 	subversion \
 	iptables \
+	swig \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /go1.4-amd64 \