diff --git a/scripts/_common.sh b/scripts/_common.sh
index bc0deff..8872aa1 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,5 +1,15 @@
 #!/bin/bash
 
+#=================================================
+# PERSONAL HELPERS
+#=================================================
+
+get_synapse_db_name() {
+	# Parameters: synapse instance identifier
+	# Returns: database name
+	ynh_app_setting_get --app="$1" --key=db_name
+}
+
 #=================================================
 # CONFIG PANEL SETTERS
 #=================================================
@@ -56,4 +66,4 @@ set__listadmin() {
   ynh_app_setting_set --app=$app --key=listadmin --value="$listadmin"
   apply_permissions
   ynh_store_file_checksum --file="$install_dir/config.yaml"
-}
\ No newline at end of file
+}
diff --git a/scripts/install b/scripts/install
index f21790d..d7f0744 100755
--- a/scripts/install
+++ b/scripts/install
@@ -14,7 +14,7 @@ server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name)
 domain=$(ynh_app_setting_get --app $synapse_instance --key domain)
 ynh_app_setting_set --app=$app --key=server_name --value=$server_name
 ynh_app_setting_set --app=$app --key=domain --value=$domain
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 
 # This is needed to convert the value from the manifest to a valid value for the config.yaml file.
 # Without this the install script will throw a warning.
diff --git a/scripts/remove b/scripts/remove
index eb852e4..9a8419b 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -17,7 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=5
 app=$YNH_APP_INSTANCE_NAME
 
 db_user=$db_name
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 bot_synapse_db_user="@""$botname"":""$server_name"
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 405c99f..d2d9d0a 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
 
 server_name=$(ynh_app_setting_get --app=$app --key=server_name)
 
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 bot_synapse_db_user="@$botname:$server_name"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 020b6e5..d5364fa 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -11,7 +11,7 @@ source /usr/share/yunohost/helpers
 
 server_name=$(ynh_app_setting_get --app=$app --key=server_name)
 
-synapse_db_name="matrix_$synapse_instance"
+synapse_db_name="$(get_synapse_db_name $synapse_instance)"
 bot_synapse_db_user="@$botname:$server_name"
 
 #=================================================