diff --git a/scripts/install b/scripts/install
index a314bfa..563b3cd 100755
--- a/scripts/install
+++ b/scripts/install
@@ -118,11 +118,12 @@ pushd "$final_path"
 	# Setup go exe and environnement
 	ynh_use_go
 	export GOPATH="$final_path/go"
-	export GOCACHE="$final_path/.cache"
+	export GOCACHE="$final_path/go/.cache"
 	# Build server from source
 	make build 2>&1
 	# Setup a nice Yunohost logo
 	cp /usr/share/yunohost/admin/img/logo.08bab97e.png web/themes/light/logo.png
+	ynh_secure_remove --file="$final_path/go"
 popd
 
 ynh_remove_go
diff --git a/scripts/upgrade b/scripts/upgrade
index cd94e68..442bb03 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -100,11 +100,12 @@ pushd "$final_path"
 	# Setup go exe and environnement
 	ynh_use_go
 	export GOPATH="$final_path/go"
-	export GOCACHE="$final_path/.cache"
+	export GOCACHE="$final_path/go/.cache"
 	# Build server from source
 	make build 2>&1
 	# Setup a nice Yunohost logo
 	cp /usr/share/yunohost/admin/img/logo.08bab97e.png web/themes/light/logo.png
+	ynh_secure_remove --file="$final_path/go"
 popd
 
 ynh_remove_go