diff --git a/config.sample.json b/config.sample.json
index 8497bba4..8ab4e994 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -26,12 +26,13 @@
     "defaultCountryCode": "GB",
     "showLabsSettings": false,
     "features": {
-        "feature_alternate_message_layouts": "labs",
         "feature_font_scaling": "labs",
         "feature_pinning": "labs",
         "feature_custom_status": "labs",
         "feature_custom_tags": "labs",
-        "feature_state_counters": "labs"
+        "feature_state_counters": "labs",
+        "feature_irc_ui": "labs",
+        "feature_no_timeline_avatars": "labs"
     },
     "default_federate": true,
     "default_theme": "light",
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index bd949dec..ab09c54e 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -13,7 +13,6 @@
     "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "features": {
-        "feature_alternate_message_layouts": "labs",
         "feature_font_scaling": "labs",
         "feature_pinning": "labs",
         "feature_custom_status": "labs",
@@ -27,7 +26,9 @@
         "feature_event_indexing": "disable",
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
-        "feature_custom_themes": "labs"
+        "feature_custom_themes": "labs",
+        "feature_irc_ui": "labs",
+        "feature_no_timeline_avatars": "labs"
     },
     "piwik": {
         "url": "https://piwik.riot.im/",