diff --git a/scripts/install b/scripts/install
index 15d9de9..2394a3d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -126,8 +126,8 @@ ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION
 pushd "$final_path/build"
 	# Build the sources
 	ynh_use_go
-	export GOPATH="$final_path/go"
-	export GOCACHE="$final_path/.cache"
+	export GOPATH="$final_path/build/go"
+	export GOCACHE="$final_path/build/.cache"
 	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/dendrite-monolith-server > /dev/null 2>&1
 	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/goose > /dev/null 2>&1
 	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/create-account > /dev/null 2>&1
diff --git a/scripts/upgrade b/scripts/upgrade
index c42228c..7eb6e9b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -120,8 +120,8 @@ then
 	pushd "$final_path/build"
 		# Build the sources
 		ynh_use_go
-		export GOPATH="$final_path/go"
-		export GOCACHE="$final_path/.cache"
+		export GOPATH="$final_path/build/go"
+		export GOCACHE="$final_path/build/.cache"
 		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/dendrite-monolith-server > /dev/null 2>&1
 		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/goose > /dev/null 2>&1
 		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/create-account > /dev/null 2>&1