diff --git a/README.md b/README.md
index 7b22208..d413313 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p
 
 
 **Shipped version:** 0.12.0~ynh1
+
 ## :red_circle: Antifeatures
 
 - **Alpha software**: Early development stage. May contain changing or unstable features, bugs, and security vulnerability.
diff --git a/README_fr.md b/README_fr.md
index db77687..59754c3 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -26,6 +26,7 @@ Dendrite is a second-generation Matrix homeserver written in Go. It intends to p
 
 
 **Version incluse :** 0.12.0~ynh1
+
 ## :red_circle: Fonctions indésirables
 
 - **Alpha software**: Early development stage. May contain changing or unstable features, bugs, and security vulnerability.
@@ -50,4 +51,4 @@ ou
 sudo yunohost app upgrade dendrite -u https://github.com/YunoHost-Apps/dendrite_ynh/tree/testing --debug
 ```
 
-**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
\ No newline at end of file
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>
diff --git a/scripts/install b/scripts/install
index c9cf4eb..c148d2a 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="$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
+	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
 popd
 
 ynh_secure_remove --file="$install_dir/build"
diff --git a/scripts/upgrade b/scripts/upgrade
index a6eb488..59aa843 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -96,11 +96,11 @@ then
 	pushd "$install_dir/build"
 		# Build the sources
 		ynh_use_go
-		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
+		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
 	popd
 
 #REMOVEME? 	ynh_secure_remove --file="$install_dir/build"