diff --git a/README.md b/README.md
index d93328d..576c8d2 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Element is a new type of messaging app. You choose where your messages are stored, putting you in control of your data. It gives you access to the Matrix open network, so you can talk to anyone. Element provides a new level of security, adding cross-signed device verification to default end-to-end encryption.
 
-**Shipped version:** 1.10.15~ynh1
+**Shipped version:** 1.11.0~ynh1
 
 **Demo:** https://app.element.io/
 
diff --git a/README_fr.md b/README_fr.md
index 9d76011..e9783ef 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Element est un nouveau type d'application de messagerie. Vous choisissez où vos messages sont stockés, ce qui vous donne le contrôle de vos données. Il vous donne accès au réseau ouvert Matrix, vous pouvez donc parler à n'importe qui. Element offre un nouveau niveau de sécurité, en ajoutant la vérification des appareils par signature croisée au chiffrement de bout en bout par défaut. 
 
-**Version incluse :** 1.10.15~ynh1
+**Version incluse :** 1.11.0~ynh1
 
 **Démo :** https://app.element.io/
 
diff --git a/conf/app.src b/conf/app.src
index 4322149..175f06f 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.10.15/element-v1.10.15.tar.gz
-SOURCE_SUM=a2c39b9cdb36ac3f4d028bf83edd4091cd54b27df73a91040ae99886ddbfd416
+SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.0/element-v1.11.0.tar.gz
+SOURCE_SUM=03919ddbec5475f5fe5994099630d0b91dd7999884ee4de408129fd15a9e9f51
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/config.json b/conf/config.json
index 7a5b772..913a49a 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -1,5 +1,8 @@
 {
-    "default_server_name": "__DEFAULT_HOME_SERVER__",
+    "default_server_config": {
+        "m.homeserver": { "base_url": "https://__DEFAULT_HOME_SERVER__" },
+        "m.identity_server": {"base_url": "https://vector.im"}
+    },
     "brand": "Element",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
diff --git a/config_panel.toml b/config_panel.toml
deleted file mode 100644
index 577ee16..0000000
--- a/config_panel.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-version = "1.0"
-
-[main]
-name = "Element configuration"
-
-    [main.config]
-    name = "Server Configuration"
-
-        [main.config.default_home_server]
-        ask = "Choose a home server"
-        type = "string"
-        default = "matrix.org"
-        help = "Choose your default Matrix server's domain name. Default is matrix.org"
-        bind = "default_server_name:__FINALPATH__/config.json"
diff --git a/manifest.json b/manifest.json
index 11bb6f6..c16477f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Web client for Matrix",
 		"fr": "Client web pour Matrix"
 	},
-	"version": "1.10.15~ynh1",
+	"version": "1.11.0~ynh1",
 	"url": "https://element.io",
 	"upstream": {
         "license": "Apache-2.0",
diff --git a/scripts/upgrade b/scripts/upgrade
index ba4ec4c..2d4a6b8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -48,7 +48,7 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 # If default_home_server doesn't exist, create it
 if [ -z "$default_home_server" ]; then
-	default_home_server="https://matrix-client.matrix.org"
+	default_home_server="matrix.org"
 	ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server
 fi