diff --git a/manifest.json b/manifest.json
index 5e3ec17..d333f6f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -19,8 +19,7 @@
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.0-fpm",
-        "mysql"
+        "php7.3-fpm"
     ],
     "arguments": {
         "install" : [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index e6ba92f..2463abb 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 pkg_dependencies="imagemagick acl tar smbclient at postgresql"
 
 YNH_PHP_VERSION="7.3"
-extra_php_dependencies="php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-smbclient php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-pgsql"
+extra_php_dependencies="php${YNH_PHP_VERSION}-bz2 php${YNH_PHP_VERSION}-imap php${YNH_PHP_VERSION}-smbclient php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-apcu php${YNH_PHP_VERSION}-redis php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-igbinary php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-pgsql"
 
 #=================================================
 # EXPERIMENTAL HELPERS
diff --git a/scripts/install b/scripts/install
index 3c120d4..ed052e4 100755
--- a/scripts/install
+++ b/scripts/install
@@ -65,7 +65,7 @@ ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2
 db_name=$(ynh_sanitize_dbid --db_name=$app)
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_psql_test_if_first_run
-ynh_psql_create_db --db_user=$db_name --db_name=$db_name
+ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/upgrade b/scripts/upgrade
index 8c07855..f30fe14 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -230,6 +230,24 @@ datadir="/home/yunohost.app/$app/data"
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
+    #=================================================
+    # HANDLE DATABASE MIGRATION
+    #=================================================
+
+    mysql_db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
+    if [ -n "$mysql_db_pwd" ]
+    then
+        ynh_script_progression --message="Migrate Database..."
+
+        ynh_psql_test_if_first_run
+        ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
+
+        exec_occ db:convert-type --all-apps pgsql $db_name 127.0.0.1 $db_name --password=$db_pwd -n
+
+        ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name
+        ynh_app_setting_delete --app=$app --key=mysqlpwd
+    fi
+
     ynh_script_progression --message="Upgrading Nextcloud..." --weight=3
 
     # Load the last available version