diff --git a/scripts/install b/scripts/install
index 2b7f8c8..87cfd0b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -37,6 +37,7 @@ pushd $install_dir
 	ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/
 popd
 
+ynh_remove_go
 chmod +x "$install_dir/vore"
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 0fbc0ba..5db6c8a 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -27,8 +27,6 @@ ynh_remove_systemd_config
 
 ynh_remove_nginx_config
 
-ynh_remove_go
-
 #=================================================
 # END OF SCRIPT
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 33de990..b9ae98d 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -35,6 +35,8 @@ then
 		ynh_exec_warn_less ynh_exec_as $app CGO_ENABLED=0 $ynh_go build -o $install_dir/
 	popd
 
+	ynh_remove_go
+
 	chown -R $app:www-data "$install_dir"
 	chmod +x "$install_dir/vore"
 fi