diff --git a/scripts/install b/scripts/install
index 1e1621d..2031b37 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,6 +66,9 @@ db_name=$(ynh_sanitize_dbid --db_name=$app)
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name
 
+ynh_mysql_connect_as --user=$db_name --password="$db_pwd" --database=$db_name \
+    <<< "ALTER DATABASE $db_name CHARACTER SET utf8 COLLATE utf8_general_ci;"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 5805432..0569ce4 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -221,6 +221,7 @@ then
     # Print the current version number of Nextcloud
     exec_occ -V
 
+    exec_occ db:convert-mysql-charset
 
     # Upgrade may fail if this app is enabled
     # Take all apps enabled, and check if mail is one of them