diff --git a/check_process b/check_process
index b7f56a3..2beeea8 100644
--- a/check_process
+++ b/check_process
@@ -13,7 +13,7 @@
         setup_public=1
         upgrade=1
         backup_restore=1
-        multi_instance=0
+        multi_instance=1
         port_already_use=1 (8085)
         # Checks not supported yet
         change_url=0
diff --git a/manifest.json b/manifest.json
index 6924340..863002e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -13,7 +13,7 @@
         "name": "pmorinerie",
         "email": "kemenaran@gmail.com"
     },
-    "multi_instance": false,
+    "multi_instance": true,
     "services": [
         "nginx"
     ],
diff --git a/scripts/install b/scripts/install
index a683626..2c5160f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -91,19 +91,20 @@ logs_path="/var/log/$app"
 # CREATE A MYSQL DATABASE
 #=================================================
 
-db_name="mattermost"
+db_name="$app"
 db_user="mmuser"
 db_password=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')
-ynh_mysql_create_db $db_name $db_user $db_password
-ynh_app_setting_set mattermost mysqlpwd "$db_password"
+ynh_mysql_create_db "$db_name" "$db_user" "$db_password"
+ynh_app_setting_set "$app" mysqlpwd "$db_password"
 
 #=================================================
 # CREATE USER FOR EMAIL NOTIFICATIONS
 #=================================================
 
+smtp_user="$app"
 smtp_password=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')
-sudo useradd -M --shell /bin/false -p $(openssl passwd -1 "$smtp_password") "mattermost"
-ynh_app_setting_set mattermost smtppwd "$smtp_password"
+sudo useradd -M --shell /bin/false -p $(openssl passwd -1 "$smtp_password") "$smtp_user"
+ynh_app_setting_set "$app" smtppwd "$smtp_password"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -131,7 +132,7 @@ sudo sed -i "s|\"Directory\": \"./data/\"|\"Directory\": \"${data_path}/\"|g"
 sudo sed -i "s|\"SendEmailNotifications\": false|\"SendEmailNotifications\": true|g"   $final_path/config/config.json
 sudo sed -i "s|\"FeedbackName\": \"\"|\"FeedbackName\": \"Mattermost notification\"|g" $final_path/config/config.json
 sudo sed -i "s|\"FeedbackEmail\": \"\"|\"FeedbackEmail\": \"no-reply@${domain}\"|g"    $final_path/config/config.json
-sudo sed -i "s|\"SMTPUsername\": \"\"|\"SMTPUsername\": \"mattermost\"|g"              $final_path/config/config.json
+sudo sed -i "s|\"SMTPUsername\": \"\"|\"SMTPUsername\": \"${smtp_user}\"|g"            $final_path/config/config.json
 sudo sed -i "s|\"SMTPPassword\": \"\"|\"SMTPPassword\": \"${smtp_password}\"|g"        $final_path/config/config.json
 sudo sed -i "s|\"SMTPServer\": \"\"|\"SMTPServer\": \"localhost\"|g"                   $final_path/config/config.json
 sudo sed -i "s|\"SMTPPort\": \"\"|\"SMTPPort\": \"25\"|g"                              $final_path/config/config.json
@@ -149,9 +150,9 @@ ynh_app_setting_set "$app" analytics "$analytics"
 # SECURE FILES AND DIRECTORIES
 #=================================================
 
-sudo chown -R mattermost:www-data "$final_path"
-sudo chown -R mattermost:www-data "$data_path"
-sudo chown -R mattermost:adm      "$logs_path"
+sudo chown -R "$smtp_user:www-data" "$final_path"
+sudo chown -R "$smtp_user:www-data" "$data_path"
+sudo chown -R "$smtp_user:adm"      "$logs_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -192,4 +193,4 @@ sudo systemctl reload nginx
 # START SERVER
 #=================================================
 
-sudo systemctl start mattermost
+sudo systemctl start "$app"
diff --git a/scripts/remove b/scripts/remove
index 2325037..cee4c2c 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -14,9 +14,10 @@ source /usr/share/yunohost/helpers
 #=================================================
 
 app=$YNH_APP_INSTANCE_NAME
-domain=$(ynh_app_setting_get mattermost domain)
-db_name="mattermost"
+domain=$(ynh_app_setting_get $app domain)
+db_name="$app"
 db_user="mmuser"
+smtp_user="$app"
 final_path="/var/www/$app"
 data_path="/home/yunohost.app/$app"
 logs_path="/var/log/$app"
@@ -76,4 +77,4 @@ sudo rm -rf "$logs_path"
 # REMOVE DEDICATED USER
 #=================================================
 
-ynh_system_user_delete "$app"
+ynh_system_user_delete "$smtp_user"
diff --git a/scripts/restore b/scripts/restore
index 514bc46..6ae3cff 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -27,6 +27,7 @@ data_path="/home/yunohost.app/$app"
 logs_path="/var/log/$app"
 db_name="$app"
 db_user="mmuser"
+smtp_user="$app"
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
@@ -62,8 +63,8 @@ ynh_restore_file "$data_path"
 #=================================================
 
 db_pwd=$(ynh_app_setting_get $app mysqlpwd)
-ynh_mysql_setup_db $db_user $db_name $db_pwd
-ynh_mysql_connect_as $db_user $db_pwd $db_name < ./db.sql
+ynh_mysql_setup_db "$db_user" "$db_name" "$db_pwd"
+ynh_mysql_connect_as "$db_user" "$db_pwd" "$db_name" < ./db.sql
 
 #=================================================
 # RECREATE THE DEDICATED USER
@@ -81,13 +82,13 @@ fi
 #=================================================
 
 # Restore permissions on app files
-sudo chown -R mattermost:www-data "$final_path"
+sudo chown -R "$smtp_user:www-data" "$final_path"
 
 mkdir -p "$data_path"
-sudo chown -R mattermost:www-data "$data_path"
+sudo chown -R "$smtp_user:www-data" "$data_path"
 
 mkdir -p "$logs_path"
-sudo chown -R mattermost:adm "$logs_path"
+sudo chown -R "$smtp_user:adm" "$logs_path"
 
 #=================================================
 # RESTORE SSOWAT
diff --git a/scripts/upgrade b/scripts/upgrade
index 27670b1..a101c06 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -21,9 +21,10 @@ ynh_abort_if_errors
 #=================================================
 
 app=$YNH_APP_INSTANCE_NAME
-domain=$(ynh_app_setting_get mattermost domain)
-is_public=$(ynh_app_setting_get mattermost is_public)
-port=$(ynh_app_setting_get mattermost port)
+domain=$(ynh_app_setting_get $app domain)
+is_public=$(ynh_app_setting_get $app is_public)
+port=$(ynh_app_setting_get $app port)
+smtp_user="$app"
 
 root_path="$(pwd)/.."
 final_path="/var/www/$app"
@@ -143,9 +144,9 @@ fi
 # RESTORE FILE PERMISSIONS
 #=================================================
 
-sudo chown -R mattermost:www-data "$final_path"
-sudo chown -R mattermost:www-data "$data_path"
-sudo chown -R mattermost:adm      "$logs_path"
+sudo chown -R "$smtp_user:www-data" "$final_path"
+sudo chown -R "$smtp_user:www-data" "$data_path"
+sudo chown -R "$smtp_user:adm"      "$logs_path"
 
 #=================================================
 # RELOAD NGINX