diff --git a/conf/database.inc.php b/conf/database.inc.php
index fe6160c..9001a57 100644
--- a/conf/database.inc.php
+++ b/conf/database.inc.php
@@ -1,8 +1,8 @@
 <?php
 $conf['dblayer'] = 'mysqli';
-$conf['db_base'] = '__DBTOCHANGE__';
-$conf['db_user'] = '__USERTOCHANGE__';
-$conf['db_password'] = '__PASSTOCHANGE__';
+$conf['db_base'] = '__DB_NAME__';
+$conf['db_user'] = '__DB_NAME__';
+$conf['db_password'] = '__DB_PWD__';
 $conf['db_host'] = 'localhost';
 
 $prefixeTable = '';
diff --git a/scripts/backup b/scripts/backup
index d3cfaab..9791cc8 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -69,7 +69,7 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
 # BACKUP THE DATA DIRECTORY
 #=================================================
 
-ynh_backup --src_path="/home/yunohost.app/${app}/upload" --is_big
+ynh_backup --src_path="/home/yunohost.app/$app/upload" --is_big
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/install b/scripts/install
index 6cb8ed3..2902c96 100644
--- a/scripts/install
+++ b/scripts/install
@@ -181,11 +181,7 @@ cp ../conf/config.inc.php $final_path/local/config/
 ynh_store_file_checksum --file="$final_path/local/config/config.inc.php"
 
 # Setup database in local/config/database.inc.php
-ynh_replace_string --match_string="__DBTOCHANGE__" --replace_string="$db_name" --target_file=../conf/database.inc.php
-ynh_replace_string --match_string="__USERTOCHANGE__" --replace_string="$db_name" --target_file=../conf/database.inc.php
-ynh_replace_string --match_string="__PASSTOCHANGE__" --replace_string="$db_pwd" --target_file=../conf/database.inc.php
-
-cp ../conf/database.inc.php $final_path/local/config/database.inc.php
+ynh_add_config --template="../conf/database.inc.php" --destination="$final_path/local/config/database.inc.php"
 
 # Calculate and store the database config file checksum
 ynh_store_file_checksum --file="$final_path/local/config/database.inc.php"
diff --git a/scripts/restore b/scripts/restore
index 38fb466..b267c64 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -130,7 +130,7 @@ chown -R $app: /home/yunohost.app/$app
 #=================================================
 ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2
 
-ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload
+ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 5ad0559..d4176fc 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -24,6 +24,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 language=$(ynh_app_setting_get --app=$app --key=language)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 admin_pwd=$(ynh_app_setting_get --app=$app --key=admin_pwd)
+db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 
 #=================================================
 # CHECK VERSION
@@ -223,13 +224,7 @@ ynh_store_file_checksum --file="$final_path/local/config/config.inc.php"
 # Make a backup of the original database config file if modified
 ynh_backup_if_checksum_is_different --file="$final_path/local/config/database.inc.php"
 
-# Setup database in local/config/database.inc.php
-ynh_replace_string --match_string="__DBTOCHANGE__" --replace_string="$db_name" --target_file=../conf/database.inc.php
-ynh_replace_string --match_string="__USERTOCHANGE__" --replace_string="$db_name" --target_file=../conf/database.inc.php
-db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
-ynh_replace_string --match_string="__PASSTOCHANGE__" --replace_string="$db_pwd" --target_file=../conf/database.inc.php
-
-cp ../conf/database.inc.php $final_path/local/config/database.inc.php
+ynh_add_config --template="../conf/database.inc.php" --destination="$final_path/local/config/database.inc.php"
 
 # Calculate and store the database config file checksum
 ynh_store_file_checksum --file="$final_path/local/config/database.inc.php"