diff --git a/README.md b/README.md
index 809d41e..633d577 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot
 
 #### Supported architectures
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mineweb%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mineweb/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/minewebP%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mineweb/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mineweb.svg)](https://ci-apps.yunohost.org/ci/apps/mineweb/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mineweb.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mineweb/)
 
 ## Limitations
 
diff --git a/README_fr.md b/README_fr.md
index 6811323..2e786dd 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -35,8 +35,8 @@ Comment configurer cette application : via le panneau d'administration
 
 #### Architectures supportées
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mineweb%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mineweb/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/minewebP%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mineweb/)
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mineweb.svg)](https://ci-apps.yunohost.org/ci/apps/mineweb/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mineweb.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mineweb/)
 
 ## Limitations
 
diff --git a/check_process b/check_process
index 3f6d5e3..a452115 100644
--- a/check_process
+++ b/check_process
@@ -16,7 +16,6 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		port_already_use=0
 		change_url=0
 ;;; Options
 Email=
diff --git a/conf/database.php b/conf/database.php
index 1af61fc..4b615ff 100755
--- a/conf/database.php
+++ b/conf/database.php
@@ -5,7 +5,7 @@ class DATABASE_CONFIG {
 		'datasource' => 'Database/Mysql',
 		'persistent' => false,
 		'host' => 'localhost',
-		'login' => '__DB_USER__',
+		'login' => '__DB_NAME__',
 		'password' => '__DB_PWD__',
 		'database' => '__DB_NAME__',
 		'encoding' => 'utf8',
diff --git a/manifest.json b/manifest.json
index 8c25432..2fa500e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Customizable and intuitive CMS.",
         "fr": "CMS personnalisable et intuitif."
     },
-    "version": "1.13.0~ynh2",
+    "version": "1.13.0~ynh3",
     "url": "https://mineweb.org/",
     "license": "AGPL-3.0-only",
     "maintainer": {
diff --git a/pull_request.md b/pull_request.md
index 99dcd36..6c28fc5 100644
--- a/pull_request.md
+++ b/pull_request.md
@@ -13,6 +13,4 @@
 
 ## Package_check results
 ---
-*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
-
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/mineweb_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/mineweb_ynh%20PR-NUM-%20(USERNAME)/)  
+* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"*
diff --git a/scripts/install b/scripts/install
index 49b81bb..0245f7b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -58,7 +58,6 @@ ynh_script_progression --message="Creating a MySQL database..." --weight=2
 db_name=$(ynh_sanitize_dbid $app)
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -98,13 +97,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 # MODIFY A CONFIG FILE
 #=================================================
 
-cp -a ../conf/database.php $final_path/app/Config/database.php
-
-ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$final_path/app/Config/database.php"
-ynh_replace_string --match_string="__DB_PWD__"  --replace_string="$db_pwd"  --target_file="$final_path/app/Config/database.php"
-ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/app/Config/database.php"
-
-ynh_store_file_checksum --file="$final_path/app/Config/database.php"
+ynh_add_config --template="../conf/database.php" --destination="$final_path/app/Config/database.php"
 
 #=================================================
 # MODIFY FIRST.CTP 
diff --git a/scripts/upgrade b/scripts/upgrade
index 2b60ae4..7b179fb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -109,15 +109,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies"
 # MODIFY A CONFIG FILE
 #=================================================
 
-ynh_backup_if_checksum_is_different --file="$final_path/app/Config/database.php"
-
-cp -a ../conf/database.php $final_path/app/Config/database.php
-
-ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$final_path/app/Config/database.php"
-ynh_replace_string --match_string="__DB_PWD__"  --replace_string="$db_pwd"  --target_file="$final_path/app/Config/database.php"
-ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/app/Config/database.php"
-
-ynh_store_file_checksum --file="$final_path/app/Config/database.php"
+ynh_add_config --template="../conf/database.php" --destination="$final_path/app/Config/database.php"
 
 #=================================================
 # MODIFY FIRST.CTP