diff --git a/1.10/alpine3.7/Dockerfile b/1.10/alpine3.7/Dockerfile
index dee775b2..e1cfdd36 100644
--- a/1.10/alpine3.7/Dockerfile
+++ b/1.10/alpine3.7/Dockerfile
@@ -51,7 +51,14 @@ RUN set -eux; \
 	done; \
 	./make.bash; \
 	\
-	rm -rf /go-alpine-patches; \
+	rm -rf \
+		/go-alpine-patches \
+# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
+		/usr/local/go/pkg/bootstrap \
+# https://golang.org/cl/82095
+# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56
+		/usr/local/go/pkg/obj \
+	; \
 	apk del .build-deps; \
 	\
 	export PATH="/usr/local/go/bin:$PATH"; \
diff --git a/1.10/alpine3.8/Dockerfile b/1.10/alpine3.8/Dockerfile
index 49bb202e..13b44817 100644
--- a/1.10/alpine3.8/Dockerfile
+++ b/1.10/alpine3.8/Dockerfile
@@ -51,7 +51,14 @@ RUN set -eux; \
 	done; \
 	./make.bash; \
 	\
-	rm -rf /go-alpine-patches; \
+	rm -rf \
+		/go-alpine-patches \
+# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
+		/usr/local/go/pkg/bootstrap \
+# https://golang.org/cl/82095
+# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56
+		/usr/local/go/pkg/obj \
+	; \
 	apk del .build-deps; \
 	\
 	export PATH="/usr/local/go/bin:$PATH"; \
diff --git a/1.11-rc/alpine3.7/Dockerfile b/1.11-rc/alpine3.7/Dockerfile
index 687d482e..22456237 100644
--- a/1.11-rc/alpine3.7/Dockerfile
+++ b/1.11-rc/alpine3.7/Dockerfile
@@ -51,7 +51,14 @@ RUN set -eux; \
 	done; \
 	./make.bash; \
 	\
-	rm -rf /go-alpine-patches; \
+	rm -rf \
+		/go-alpine-patches \
+# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
+		/usr/local/go/pkg/bootstrap \
+# https://golang.org/cl/82095
+# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56
+		/usr/local/go/pkg/obj \
+	; \
 	apk del .build-deps; \
 	\
 	export PATH="/usr/local/go/bin:$PATH"; \
diff --git a/1.11-rc/alpine3.8/Dockerfile b/1.11-rc/alpine3.8/Dockerfile
index aad37d03..94341434 100644
--- a/1.11-rc/alpine3.8/Dockerfile
+++ b/1.11-rc/alpine3.8/Dockerfile
@@ -51,7 +51,14 @@ RUN set -eux; \
 	done; \
 	./make.bash; \
 	\
-	rm -rf /go-alpine-patches; \
+	rm -rf \
+		/go-alpine-patches \
+# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
+		/usr/local/go/pkg/bootstrap \
+# https://golang.org/cl/82095
+# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56
+		/usr/local/go/pkg/obj \
+	; \
 	apk del .build-deps; \
 	\
 	export PATH="/usr/local/go/bin:$PATH"; \
diff --git a/1.9/alpine3.7/Dockerfile b/1.9/alpine3.7/Dockerfile
index 0959db2f..8fdff076 100644
--- a/1.9/alpine3.7/Dockerfile
+++ b/1.9/alpine3.7/Dockerfile
@@ -51,7 +51,14 @@ RUN set -eux; \
 	done; \
 	./make.bash; \
 	\
-	rm -rf /go-alpine-patches; \
+	rm -rf \
+		/go-alpine-patches \
+# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
+		/usr/local/go/pkg/bootstrap \
+# https://golang.org/cl/82095
+# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56
+		/usr/local/go/pkg/obj \
+	; \
 	apk del .build-deps; \
 	\
 	export PATH="/usr/local/go/bin:$PATH"; \
diff --git a/1.9/alpine3.8/Dockerfile b/1.9/alpine3.8/Dockerfile
index e0166596..06f61ae6 100644
--- a/1.9/alpine3.8/Dockerfile
+++ b/1.9/alpine3.8/Dockerfile
@@ -51,7 +51,14 @@ RUN set -eux; \
 	done; \
 	./make.bash; \
 	\
-	rm -rf /go-alpine-patches; \
+	rm -rf \
+		/go-alpine-patches \
+# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
+		/usr/local/go/pkg/bootstrap \
+# https://golang.org/cl/82095
+# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56
+		/usr/local/go/pkg/obj \
+	; \
 	apk del .build-deps; \
 	\
 	export PATH="/usr/local/go/bin:$PATH"; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 609543de..15c44e1b 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -51,7 +51,14 @@ RUN set -eux; \
 	done; \
 	./make.bash; \
 	\
-	rm -rf /go-alpine-patches; \
+	rm -rf \
+		/go-alpine-patches \
+# https://github.com/golang/go/blob/0b30cf534a03618162d3015c8705dd2231e34703/src/cmd/dist/buildtool.go#L121-L125
+		/usr/local/go/pkg/bootstrap \
+# https://golang.org/cl/82095
+# https://github.com/golang/build/blob/e3fe1605c30f6a3fd136b561569933312ede8782/cmd/release/releaselet.go#L56
+		/usr/local/go/pkg/obj \
+	; \
 	apk del .build-deps; \
 	\
 	export PATH="/usr/local/go/bin:$PATH"; \