diff --git a/conf/config.json b/conf/config.json
index e079484..597801d 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -47,7 +47,7 @@
         "breadcrumbs": true
     },
     "jitsi": {
-        "preferredDomain": "meet.element.io"
+        "preferredDomain": "__JITSI_SERVER__"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }
diff --git a/manifest.json b/manifest.json
index 4f42b68..45a2b61 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,6 +49,16 @@
 				"example": "my-own-homeserver.tld",
 				"default": "matrix-client.matrix.org"
 			},
+			{
+				"name": "jitsi_server",
+				"type": "string",
+				"ask": {
+					"en": "Choose a Jitsi server",
+					"fr": "Choisissez un serveur Jitsi"
+				},
+				"example": "jitsi.server.tld",
+				"default": "meet.element.io"
+			},
 			{
 				"name": "is_public",
 				"type": "boolean",
diff --git a/scripts/install b/scripts/install
index 39c9aec..93ea19f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -25,6 +25,7 @@ domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER
+jitsi_server=$YNH_APP_ARG_JITSI_SERVER
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -47,6 +48,7 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
+ynh_app_setting_set --app=$app --key=jitsi_server --value=$jitsi_server
 
 #=================================================
 # CREATE DEDICATED USER
diff --git a/scripts/upgrade b/scripts/upgrade
index e6e1c85..1de6e33 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 default_home_server=$(ynh_app_setting_get --app=$app --key=default_home_server)
+jitsi_server=$(ynh_app_setting_get --app=$app --key=jitsi_server)
 
 #=================================================
 # CHECK VERSION