diff --git a/Makefile b/Makefile
index 998bf78..aa641c9 100644
--- a/Makefile
+++ b/Makefile
@@ -164,10 +164,6 @@ pre-push:
 .PHONY:
 download: plugin
 
-.PHONY: print-export-path
-print-export-path:
-	@echo "export SUBSTRATEHCP_FILE=${SUBSTRATEHCP_FILE}"
-
 ${STATIC_PLUGINS_DUMMY}:
 	${MKDIR_P} $(dir $@)
 	./scripts/obtain-plugin.sh
diff --git a/common.go.mk b/common.go.mk
index 16ddcb6..c362ba4 100644
--- a/common.go.mk
+++ b/common.go.mk
@@ -27,6 +27,8 @@ GO_PKG_VOLUME_DUMMY=${PROJECT_REL_DIR}/$(call DUMMY_TARGET,volume,${GO_PKG_VOLUM
 GO_BUILD_TAGS ?= osusergo,netgo,cgo,timetzdata
 GO_BUILD_FLAGS="-installsuffix ${GO_BUILD_TAGS} -tags ${GO_BUILD_TAGS} -buildvcs=false"
 
+HOST_GO_ENV=SUBSTRATEHCP_FILE=${SUBSTRATEHCP_FILE}
+
 .PHONY: default
 default: docker-build
 	@
diff --git a/common.mk b/common.mk
index 614b4fc..7b80c59 100644
--- a/common.mk
+++ b/common.mk
@@ -42,7 +42,7 @@ else
   ARCH_SUFFIX := $(ARCH)
 endif
 
-SUBSTRATE_PLUGIN_OS=${PROJECT_REL_DIR}/build/substratehcp-$(1)-${ARCH_SUFFIX}-${SUBSTRATE_VERSION}
+SUBSTRATE_PLUGIN_OS=build/substratehcp-$(1)-${ARCH_SUFFIX}-${SUBSTRATE_VERSION}
 SUBSTRATE_PLUGIN_LINUX=$(call SUBSTRATE_PLUGIN_OS,linux)
 SUBSTRATE_PLUGIN_DARWIN=$(call SUBSTRATE_PLUGIN_OS,darwin)
 SUBSTRATE_PLUGIN=${SUBSTRATE_PLUGIN_DARWIN} ${SUBSTRATE_PLUGIN_LINUX}