diff --git a/conf/mysql-to-pg.conf b/conf/mysql-to-pg.conf
new file mode 100644
index 0000000..6144592
--- /dev/null
+++ b/conf/mysql-to-pg.conf
@@ -0,0 +1,5 @@
+LOAD DATABASE
+        FROM mysql://mattermost:$mysql_db_pwd@localhost:3306/mattermost
+        INTO postgresql://mattermost:$postgres_db_pwd@localhost:5432/mattermost
+        WITH data only
+;
diff --git a/scripts/upgrade b/scripts/upgrade
index ab2241f..79f0643 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -188,11 +188,11 @@ if mysqlshow | grep -q "^| $db_name "; then
   postgres_db_pwd=$(ynh_string_random --length=24)
   ynh_app_setting_set --app=$app --key=postgres_db_pwd --value=$postgres_db_pwd
   ynh_psql_test_if_first_run
-  ynh_psql_create_user $db_user $postgres_db_pwd
-  ynh_psql_execute_as_root --sql="CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' TEMPLATE template0 OWNER $db_user"
+  ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$postgres_db_pwd
 
   # Migrating from MySQL to PostgreSQL
-  pgloader mysql://$db_user:$mysql_db_pwd@localhost:3306/$db_name postgresql://$db_user:$postgres_db_pwd@localhost:5432/$db_name
+  pgloader ../conf/mysql-to-pg.conf
+
   # Removinging MySQL database
   ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name