diff --git a/manifest.json b/manifest.json
index 2de3fed..7a9beef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "A WhatsApp puppeting bridge for Matrix/Synapse.",
 		"fr": "Passerelle WhatsApp pour Matrix/Synapse."
 	},
-	"version": "0.1.7~ynh2",
+	"version": "0.1.7~ynh3",
 	"url": "https://github.com/tulir/mautrix-whatsapp",
 	"license": "AGPL-3.0-or-later",
 	"maintainer": {
diff --git a/scripts/install b/scripts/install
index 2c16730..946a3cd 100755
--- a/scripts/install
+++ b/scripts/install
@@ -125,8 +125,10 @@ fi
 
 ynh_install_extra_app_dependencies --repo="http://http.debian.net/debian buster-backports main" --package="golang-go"
 
-#export GOPATH="$final_path"
-#export GOCACHE="$GOPATH"/.cache/go-build
+src_path="$final_path"/src
+mkdir -p $src_path
+export GOPATH="$src_path"
+export GOCACHE="$GOPATH"/.cache/go-build
 
 export PATH=$PATH:$GO_PATH
 env_path=$PATH
diff --git a/scripts/upgrade b/scripts/upgrade
index fd8ff46..840e0ba 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -133,13 +133,16 @@ ynh_install_extra_app_dependencies --repo="http://http.debian.net/debian buster-
 # Migration from 1.6.0
 ynh_secure_remove --file="$final_path"/asmux.go
 src_path="$final_path"_src
-#export GOPATH=$src_path
-#export GOCACHE="$GOPATH"/.cache/go-build
 # Remove a directory securely
 ynh_secure_remove --file="$src_path"
 #export PATH=$PATH:$GO_PATH
 #env_path=$PATH
 
+src_path="$final_path"/src
+mkdir -p $src_path
+export GOPATH="$src_path"
+export GOCACHE="$GOPATH"/.cache/go-build
+
 #=================================================
 # BUILD GO
 #=================================================