diff --git a/conf/amd64.src b/conf/amd64.src
index f527acd..9e1a7f3 100644
--- a/conf/amd64.src
+++ b/conf/amd64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.23.2/matterbridge-1.23.2-linux-64bit
-SOURCE_SUM=a2604f29220de248bd51f0fb8e6458cbf64d853731fed959190ae6f351344f5f
+SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.24.0/matterbridge-1.24.0-linux-64bit
+SOURCE_SUM=f0159937beb21729e87a55fc3b412ed6c2eb8a1951a381dc87aec5ec31058b37
 SOURCE_SUM_PRG=sha256sum
 SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=matterbridge
diff --git a/conf/arm64.src b/conf/arm64.src
index dbabd90..4c358d1 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.23.2/matterbridge-1.23.2-linux-arm64
-SOURCE_SUM=a5a93c3e62f25b1c4a9d5d59a7e28288bc733af1a3a579245b0ced9de68843ad
+SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.24.0/matterbridge-1.24.0-linux-arm64
+SOURCE_SUM=e9968cac4fddc0de34b9df95b7fcdaedaecd6338cbdcb1041aa0adad6740e60c
 SOURCE_SUM_PRG=sha256sum
 SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=matterbridge
diff --git a/conf/armhf.src b/conf/armhf.src
index db9dd82..51ff94c 100644
--- a/conf/armhf.src
+++ b/conf/armhf.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.23.2/matterbridge-1.23.2-linux-armv6
-SOURCE_SUM=5e095e7a0a90868bc5c942af0d5f69995566d26b117ae6c75ec6ba18d100ae4d
+SOURCE_URL=https://github.com/42wim/matterbridge/releases/download/v1.24.0/matterbridge-1.24.0-linux-armv6
+SOURCE_SUM=b127ce5980843b7656b4197724e192a110ce2157e3199b500ec82dc4e6939afd
 SOURCE_SUM_PRG=sha256sum
 SOURCE_IN_SUBDIR=false
 SOURCE_FILENAME=matterbridge
diff --git a/manifest.json b/manifest.json
index f3c8f5b..205a68b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Multi-protocols bridge for online communications",
         "fr": "Connecteur entre une série de protocoles de discussion"
     },
-    "version": "1.23.2~ynh2",
+    "version": "1.24.0~ynh1",
     "url": "https://github.com/42wim/matterbridge",
     "upstream": {
         "license": "Apache-2.0",
diff --git a/scripts/install b/scripts/install
index c482c20..ab23ed6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -49,11 +49,17 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+chmod +x $final_path/$app
+
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
+ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-cp -a ../conf/matterbridge.toml $final_path/matterbridge.toml
+ynh_add_config --template="../conf/matterbridge.toml" --destination="$final_path/matterbridge.toml"
 
 #=================================================
 # SETUP SYSTEMD
@@ -63,16 +69,6 @@ ynh_script_progression --message="Configuring a systemd service..." --weight=1
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions to app files
-chmod +x $final_path/$app
-chown -R $app: $final_path
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 4abe287..4f4caae 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -65,24 +65,29 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=2
 
 	# Create a temporary directory
-	tmpdir="$(mktemp -d)"
+	#tmpdir="$(mktemp -d)"
 
 	# Backup the config file in the temp dir
-	cp -a "$final_path/matterbridge.toml" "$tmpdir/matterbridge.toml"
+	#cp -a "$final_path/matterbridge.toml" "$tmpdir/matterbridge.toml"
 
 	# Remove the app directory securely
-	ynh_secure_remove --file="$final_path"
+	#ynh_secure_remove --file="$final_path"
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
+	ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" --keep="$final_path/matterbridge.toml"
 
 	# Copy the admin saved settings from tmp directory to final path	
-	cp -a "$tmpdir/matterbridge.toml" "$final_path/matterbridge.toml" 
+	#cp -a "$tmpdir/matterbridge.toml" "$final_path/matterbridge.toml" 
 
 	# Remove the tmp directory securely
-	ynh_secure_remove --file="$tmpdir"
+	#ynh_secure_remove --file="$tmpdir"
 fi
 
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+chmod +x $final_path/$app
+
 #=================================================
 # SETUP SYSTEMD
 #=================================================
@@ -91,16 +96,6 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# SECURE FILES AND DIRECTORIES
-#=================================================
-
-# Set permissions on app files
-chmod +x $final_path/$app
-chown -R $app: $final_path
-
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================