diff --git a/scripts/install b/scripts/install
index 8272942..f168327 100644
--- a/scripts/install
+++ b/scripts/install
@@ -75,11 +75,11 @@ ynh_exec_warn_less ynh_install_go --go_version=$GO_VERSION
 pushd "$install_dir/build"
 	# Build the sources
 	ynh_use_go
-	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 > /dev/null 2>&1
-	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/create-account > /dev/null 2>&1
-	CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/generate-keys > /dev/null 2>&1
+	export GOPATH="$install_dir/build/go"
+	export GOCACHE="$install_dir/build/.cache"
+	CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/dendrite > /dev/null 2>&1
+	CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/create-account > /dev/null 2>&1
+	CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/generate-keys > /dev/null 2>&1
 popd
 
 ynh_secure_remove --file="$install_dir/build"
diff --git a/scripts/upgrade b/scripts/upgrade
index cb48885..9d111ed 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -96,11 +96,11 @@ then
 	pushd "$install_dir/build"
 		# Build the sources
 		ynh_use_go
-		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 > /dev/null 2>&1
-		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/create-account > /dev/null 2>&1
-		CGO_ENABLED=1 go build -trimpath -v -o "$final_path/bin/" ./cmd/generate-keys > /dev/null 2>&1
+		export GOPATH="$install_dir/build/go"
+		export GOCACHE="$install_dir/build/.cache"
+		CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/dendrite > /dev/null 2>&1
+		CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/create-account > /dev/null 2>&1
+		CGO_ENABLED=1 go build -trimpath -v -o "$install_dir/bin/" ./cmd/generate-keys > /dev/null 2>&1
 	popd
 
 #REMOVEME? 	ynh_secure_remove --file="$install_dir/build"