diff --git a/README.md b/README.md
index 26e7f2d..bd89422 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**Shipped version:** 5.7.5~ynh1
+**Shipped version:** 5.8.0~ynh1
 
 ## Screenshots
 
diff --git a/README_es.md b/README_es.md
index 2088b16..1b5d2ac 100644
--- a/README_es.md
+++ b/README_es.md
@@ -18,7 +18,7 @@ No se debe editar a mano.
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**Versión actual:** 5.7.5~ynh1
+**Versión actual:** 5.8.0~ynh1
 
 ## Capturas
 
diff --git a/README_eu.md b/README_eu.md
index 3c9102b..8bf4a14 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**Paketatutako bertsioa:** 5.7.5~ynh1
+**Paketatutako bertsioa:** 5.8.0~ynh1
 
 ## Pantaila-argazkiak
 
diff --git a/README_fr.md b/README_fr.md
index 4148a6c..9108f41 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 SimpleX - la première plate-forme de messagerie qui n'a aucun identifiant d'utilisateur d'aucune sorte - 100 % privée de par sa conception !
 
-**Version incluse :** 5.7.5~ynh1
+**Version incluse :** 5.8.0~ynh1
 
 ## Captures d’écran
 
diff --git a/README_gl.md b/README_gl.md
index a2ec650..ed57426 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**Versión proporcionada:** 5.7.5~ynh1
+**Versión proporcionada:** 5.8.0~ynh1
 
 ## Capturas de pantalla
 
diff --git a/README_it.md b/README_it.md
index 208fe34..e0b005a 100644
--- a/README_it.md
+++ b/README_it.md
@@ -18,7 +18,7 @@ NON DEVE essere modificato manualmente.
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**Versione pubblicata:** 5.1.0~ynh2
+**Versione pubblicata:** 5.8.0~ynh1
 
 ## Screenshot
 
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 8c9c9ff..717c5ce 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -18,7 +18,7 @@
 
 SimpleX - the first messaging platform operating without user identifiers of any kind - 100% private by design! iOS and Android apps are released.
 
-**分发版本：** 5.7.5~ynh1
+**分发版本：** 5.8.0~ynh1
 
 ## 截图
 
diff --git a/manifest.toml b/manifest.toml
index 908bb74..05d2a1f 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "SimpleX"
 description.en = "Messaging platform operating without user identifiers"
 description.fr = "Plate-forme de messagerie fonctionnant sans identifiants d'utilisateurs"
 
-version = "5.7.5~ynh1"
+version = "5.8.0~ynh1"
 
 maintainers = []
 
@@ -36,19 +36,19 @@ ram.runtime = "50M"
 
  [resources.sources]
     [resources.sources.main]
-    amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.7.5/smp-server_amd64"
-    amd64.sha256 = "b507e3b7c381eefa96ec1f9f7648ded78cc971827e90f5a137335045d67425e8"
-    arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.7.5/smp-server_arm64"
-    arm64.sha256 = "525a7f3d2a361cf3344cfff2358c615b827418eb98d6c390d183b7e40fb008d4"
+    amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.8.0/smp-server_amd64"
+    amd64.sha256 = "8b5806a63ccbec373e8a4681cbb97113b0757a19b5f8a889dd9611c767b1a57c"
+    arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.8.0/smp-server_arm64"
+    arm64.sha256 = "dcf246b4e065199fbd8eb41845eef4d93ba3bcf01eeddc833bb318a6c78db988"
     in_subdir = false
     extract   = false
     rename    = "smp-server"
 
     [resources.sources.xftp]
-    amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.7.5/xftp-server_amd64"
-    amd64.sha256 = "f4182dd6ad65862705bc7fdd2c10f5e38a5483344e832ec84b7a2fc288c74ef6"
-    arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.7.5/xftp-server_arm64"
-    arm64.sha256 = "b406b793383b0dd202d6bd60f9d0054d2c4249ac34e4d87c731bb131019c1561"
+    amd64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.8.0/xftp-server_amd64"
+    amd64.sha256 = "d7550d5dc6b3ff3dfee145e39ab5da9429c6fde295d705d634e21c2e62b53142"
+    arm64.url = "https://github.com/YunoHost-Apps/simplex_ynh/releases/download/v5.8.0/xftp-server_arm64"
+    arm64.sha256 = "515bcdde8d46e07614168b926e61b1e17f039b8a2be29590cde1ff9caea5fa12"
     in_subdir = false
     extract   = false
     rename    = "xftp-server"
diff --git a/scripts/remove b/scripts/remove
index 0284b9b..3ef3ce4 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -10,10 +10,9 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# STANDARD REMOVE
-#=================================================
-# REMOVE SERVICE INTEGRATION IN YUNOHOST
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
+ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
@@ -23,13 +22,6 @@ then
 	yunohost service remove xftp
 fi
 
-#=================================================
-# REMOVE SYSTEM CONFIGURATIONS
-#=================================================
-# REMOVE SYSTEMD SERVICE 
-#=================================================
-ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 ynh_remove_systemd_config --service=xftp