diff --git a/scripts/install b/scripts/install
index 83d5123..a4036c2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -75,7 +75,7 @@ config_nginx
 config_gitea
 
 # Install gitea
-wget -O gitea https://github.com/go-gitea/gitea/releases/download/v1.3.3/gitea-1.3.3-linux-amd64 $final_path/gitea
+ynh_setup_source $final_path $architecture
 
 # Set permissions
 set_permission
@@ -112,4 +112,4 @@ ynh_use_logrotate "/var/log/$app"
 
 # Reload services
 ynh_check_starting "Serving [::]:$port with pid" "/var/log/$app/gitea.log"
-systemctl gitea restart
\ No newline at end of file
+systemctl restart gitea
diff --git a/scripts/remove b/scripts/remove
index 681dd01..c9a5682 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -43,4 +43,6 @@ ynh_system_user_delete $app
 ynh_remove_systemd_config
 
 # Remove monitor
-yunohost service remove "$app"
\ No newline at end of file
+yunohost service remove "$app"
+
+true # Do not fail if remove after install error
diff --git a/scripts/upgrade b/scripts/upgrade
index 260e566..8c4b740 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -67,7 +67,7 @@ then
     ynh_secure_remove /opt/gogs
     ynh_secure_remove /etc/gogs
     ynh_secure_remove /opt/gogs_src
-    
+
     # create needed directories if not already created
     create_dir
 fi