diff --git a/scripts/upgrade b/scripts/upgrade
index 6fe5817..70cf447 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -186,12 +186,11 @@ if mysqlshow | grep -q "^| $db_name "; then
   ynh_script_progression --message="Creating a PostgreSQL database..." --weight=10
 
   postgres_db_pwd=$(ynh_string_random --length=24)
-  db_name=$(ynh_sanitize_dbid --db_name=$app)
-  db_user=$db_name
+  ynh_app_setting_set --app=$app --key=postgres_db_pwd --value=$postgres_db_pwd
 
   ynh_psql_test_if_first_run
-  ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$postgres_db_pwd
-  ynh_app_setting_set --app=$app --key=psqlpwd --value=$postgres_db_pwd
+  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 $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