diff --git a/Makefile b/Makefile
index f7d98e3..ba6e063 100644
--- a/Makefile
+++ b/Makefile
@@ -52,11 +52,12 @@ $(FETCH_DIR)/terraform:
 	$(call git_clone,$@,$(TERRAFORM_REPO),$(TERRAFORM_REF))
 
 $(OUT_DIR)/terraform: $(FETCH_DIR)/terraform
-	$(call toolchain,$(USER)," \
+	$(call toolchain," \
 		cd $(FETCH_DIR)/terraform && \
 		export SSL_CERT_DIR=/etc/ssl/certs && \
 		export CGO_ENABLED=0 && \
-		export GOCACHE=$(CACHE_DIR) && \
+		export GOCACHE=/home/build/$(CACHE_DIR) && \
+		export GOPATH=/home/build/$(CACHE_DIR) && \
 		go build \
 			-v \
 			-trimpath \
diff --git a/src/toolchain b/src/toolchain
index 8b98574..d6189f0 160000
--- a/src/toolchain
+++ b/src/toolchain
@@ -1 +1 @@
-Subproject commit 8b98574565d17b9261e7696ee8e83a6c0740a29c
+Subproject commit d6189f0f2856d309685bfd40d9999e2b7a08ce54