diff --git a/scripts/install b/scripts/install
index 6b4266b..5745b1e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -141,7 +141,7 @@ do
 	ynh_secure_remove --file="$final_path/${package}_temp"
 done
 
-chown -R $app: $final_path
+chown -R $app: "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 0bb122c..38b9182 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -140,6 +140,18 @@ ynh_app_setting_set --app=$app --key=require_prosody --value="1"
 
 #=================================================
 # SPECIFIC UPGRADE
+#=================================================
+# CONFIGURE PROSODY
+#=================================================
+ynh_script_progression --message="Configuring Prosody..."
+
+if [ "$upgrade_type" == "UPGRADE_APP" ]
+then
+	ynh_add_config --template="../conf/prosody.cfg.lua" --destination="/etc/prosody/conf.avail/$domain.cfg.lua"
+	chmod 644 "/etc/prosody/conf.avail/$domain.cfg.lua"
+	ln -s "/etc/prosody/conf.avail/$domain.cfg.lua" "/etc/prosody/conf.d/$domain.cfg.lua"
+fi
+
 #=================================================
 # CONFIGURE JITSI-VIDEOBRIDGE
 #=================================================
@@ -150,38 +162,15 @@ then
 	public_ipv4="$(curl ip.yunohost.org)" || true
 	private_ipv4="$(ip route get 1 | sed -n 's/^.*src \([0-9.]*\) .*$/\1/p')" || true
 
-	jitsi_videobridge_sip_communicator_conf="/etc/$app/videobridge/sip-communicator.properties"
-	ynh_backup_if_checksum_is_different --file="$jitsi_videobridge_sip_communicator_conf"
-	cp -f ../conf/jitsi_videobridge-sip-communicator.properties "$jitsi_videobridge_sip_communicator_conf"
-	ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$jitsi_videobridge_sip_communicator_conf"
-	ynh_replace_string --match_string="__PRIVATE_IPV4__" --replace_string="$private_ipv4" --target_file="$jitsi_videobridge_sip_communicator_conf"
-	ynh_replace_string --match_string="__PUBLIC_IPV4__" --replace_string="$public_ipv4" --target_file="$jitsi_videobridge_sip_communicator_conf"
-	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jitsi_videobridge_sip_communicator_conf"
-	ynh_replace_string --match_string="__VIDEOBRIDGE_USER__" --replace_string="$videobridge_user" --target_file="$jitsi_videobridge_sip_communicator_conf"
-	ynh_replace_string --match_string="__VIDEOBRIDGE_SECRET__" --replace_string="$videobridge_secret" --target_file="$jitsi_videobridge_sip_communicator_conf"
-	ynh_replace_string --match_string="__MUC_NICKNAME__" --replace_string="$muc_nickname" --target_file="$jitsi_videobridge_sip_communicator_conf"
-	ynh_store_file_checksum --file="$jitsi_videobridge_sip_communicator_conf"
+	ynh_add_config --template="../conf/jitsi-videobridge-callstats-java-sdk.properties" --destination="/etc/$app/videobridge/callstats-java-sdk.properties"
 
-	jitsi_videobridge_conf="/etc/$app/videobridge/config"
-	ynh_backup_if_checksum_is_different --file="$jitsi_videobridge_conf"
-	cp ../conf/jitsi-videobridge.config "$jitsi_videobridge_conf"
-	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jitsi_videobridge_conf"
-	ynh_replace_string --match_string="__PORT_COMPONENT__" --replace_string="$port_component" --target_file="$jitsi_videobridge_conf"
-	ynh_replace_string --match_string="__VIDEOBRIDGE_SECRET__" --replace_string="$videobridge_secret" --target_file="$jitsi_videobridge_conf"
-	ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$jitsi_videobridge_conf"
-	ynh_store_file_checksum --file="$jitsi_videobridge_conf"
+	ynh_add_config --template="../conf/jitsi-videobridge-jvb.conf" --destination="/etc/$app/videobridge/jvb.conf"
 
-	jitsi_videobridge_logging_conf="/etc/$app/videobridge/logging.properties"
-	ynh_backup_if_checksum_is_different --file="$jitsi_videobridge_logging_conf"
-	cp ../conf/jitsi-videobridge-logging.properties "$jitsi_videobridge_logging_conf"
-	ynh_store_file_checksum --file="$jitsi_videobridge_logging_conf"
+	ynh_add_config --template="../conf/jitsi-videobridge-logging.properties" --destination="/etc/$app/videobridge/logging.properties"
 
-	jitsi_videobridge_callstats_java_sdk_conf="/etc/$app/videobridge/callstats-java-sdk.properties"
-	cp ../conf/jitsi-videobridge-callstats-java-sdk.properties "$jitsi_videobridge_callstats_java_sdk_conf"
+	ynh_add_config --template="../conf/jitsi-videobridge-sip-communicator.properties" --destination="/etc/$app/videobridge/sip-communicator.properties"
 
-	jitsi_videobridge_log4j2_conf="/etc/$app/videobridge/log4j2.xml"
-	cp ../conf/jitsi-videobridge-log4j2.xml "$jitsi_videobridge_log4j2_conf"
-	ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$jitsi_videobridge_log4j2_conf"
+	ynh_add_config --template="../conf/jitsi-videobridge.config" --destination="/etc/$app/videobridge/config"
 fi
 
 #=================================================
@@ -191,28 +180,11 @@ ynh_script_progression --message="configuring Jitsi-Jicofo..."
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	jitsi_jicofo_sip_communicator_conf="/etc/$app/jicofo/sip-communicator.properties"
-	ynh_backup_if_checksum_is_different --file="$jitsi_jicofo_sip_communicator_conf"
-	cp ../conf/jitsi-jicofo-sip-communicator.properties "$jitsi_jicofo_sip_communicator_conf"
-	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jitsi_jicofo_sip_communicator_conf"
-	ynh_store_file_checksum --file="$jitsi_jicofo_sip_communicator_conf"
+	ynh_add_config --template="../conf/jitsi-jicofo-config" --destination="/etc/$app/jicofo/config"
 
-	jitsi_jicofo_conf="/etc/$app/jicofo/config"
-	ynh_backup_if_checksum_is_different --file="$jitsi_jicofo_conf"
-	cp ../conf/jitsi-jicofo.config "$jitsi_jicofo_conf"
-	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$jitsi_jicofo_conf"
-	ynh_replace_string --match_string="__PORT_COMPONENT__" --replace_string="$port_component" --target_file="$jitsi_jicofo_conf"
-	ynh_replace_string --match_string="__FOCUS_SECRET__" --replace_string="$focus_secret" --target_file="$jitsi_jicofo_conf"
-	ynh_replace_string --match_string="__FOCUS_USER__" --replace_string="$focus_user" --target_file="$jitsi_jicofo_conf"
-	ynh_replace_string --match_string="__FOCUS_PASSWORD__" --replace_string="$focus_password" --target_file="$jitsi_jicofo_conf"
-	ynh_replace_string --match_string="__APP__" --replace_string="$app" --target_file="$jitsi_jicofo_conf"
-	ynh_store_file_checksum --file="$jitsi_jicofo_conf"
-
-	jitsi_jicofo_logging_conf="/etc/$app/jicofo/logging.properties"
-	ynh_backup_if_checksum_is_different --file="$jitsi_jicofo_logging_conf"
-	cp ../conf/jitsi-jicofo-logging.properties "$jitsi_jicofo_logging_conf"
-	ynh_store_file_checksum --file="$jitsi_jicofo_logging_conf"
+	ynh_add_config --template="../conf/jitsi-jicofo-jicofo.conf" --destination="/etc/$app/jicofo/jicofo.conf"
 
+	ynh_add_config --template="../conf/jitsi-jicofo-logging.properties" --destination="/etc/$app/jicofo/logging.properties"
 fi
 
 #=================================================
@@ -222,11 +194,8 @@ ynh_script_progression --message="Configuring Jitsi-Meet..."
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	jitsi_meet_conf="/etc/$app/meet/config.js"
-	ynh_backup_if_checksum_is_different --file="$jitsi_meet_conf"
-	ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/config.js"
-	cpp -undef -P ../conf/config.js -o "$jitsi_meet_conf"
-	ynh_store_file_checksum --file="$jitsi_meet_conf"
+	ynh_add_config --template="../conf/jitsi-meet-config.js" --destination="/etc/$app/meet/$domain-config.js"
+	chmod 644 "/etc/$app/meet/$domain-config.js"
 fi
 
 #=================================================