diff --git a/config.preprod.json b/config.preprod.json
index b6d5a77f5d..498be818df 100644
--- a/config.preprod.json
+++ b/config.preprod.json
@@ -43,7 +43,8 @@
     "default_theme": "custom-Tchap",
     "roomDirectory": {
         "servers": [
-            "i.tchap.gouv.fr"
+            "matrix.i.tchap.gouv.fr",
+            "matrix.e.tchap.gouv.fr"
         ]
     },
     "enable_presence_by_hs_url": {
@@ -54,6 +55,7 @@
         "breadcrumbs": true,
         "UIFeature.voip": false,
         "UIFeature.shareSocial": false,
+        "layout": "bubble",
         "custom_themes": [
             {
                 "name": "Tchap",
diff --git a/config.prod.json b/config.prod.json
index 6a1d27c967..d6adc68420 100644
--- a/config.prod.json
+++ b/config.prod.json
@@ -142,6 +142,7 @@
         "UIFeature.voip": false,
         "UIFeature.shareSocial": false,
         "UIFeature.registration": false,
+        "layout": "bubble",
         "custom_themes": [
             {
                 "name": "Tchap",