diff --git a/scripts/backup b/scripts/backup
index 95dbd9b..6534f46 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -61,7 +61,9 @@ ynh_backup --src_path="/etc/systemd/system/$app.service"
 #=================================================
 ynh_print_info --message="Backing up the PostgreSQL database..."
 
-ynh_psql_dump_db --database="$db_name" > db.sql
+ynh_psql_dump_db --database="${db_name}" > db.sql
+ynh_psql_dump_db --database="${db_name}olap" > dbolap.sql
+ynh_psql_dump_db --database="${db_name}tenant" > dbtenant.sql
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/restore b/scripts/restore
index efa81ae..d1b5b5e 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -87,8 +87,13 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Restoring the PostgreSQL database..."
 
 ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
-ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
+ynh_psql_create_user "$db_user" "$db_pwd"
+ynh_psql_execute_as_root --sql="CREATE DATABASE ${db_name} WITH OWNER ${db_user} TEMPLATE template0 ENCODING 'UTF8';"
+ynh_psql_execute_as_root --sql="CREATE DATABASE ${db_name}olap WITH OWNER ${db_user} TEMPLATE template0 ENCODING 'UTF8';"
+ynh_psql_execute_as_root --sql="CREATE DATABASE ${db_name}tenant WITH OWNER ${db_user} TEMPLATE template0 ENCODING 'UTF8';"
+ynh_psql_execute_file_as_root --file="./db.sql" --database=${db_name}
+ynh_psql_execute_file_as_root --file="./dbolap.sql" --database=${db_name}olap
+ynh_psql_execute_file_as_root --file="./dbtenant.sql" --database=${db_name}tenant
 
 #=================================================
 # RESTORE SYSTEMD