diff --git a/data-template/element-web/config.json b/data-template/element-web/config.json
index 19105d9..04f9a47 100644
--- a/data-template/element-web/config.json
+++ b/data-template/element-web/config.json
@@ -20,7 +20,8 @@
     "features": {
         "feature_video_rooms": true,
         "feature_group_calls": true,
-        "feature_element_call_video_rooms": true
+        "feature_element_call_video_rooms": true,
+        "feature_oidc_native_flow": true
     },
     "default_federate": true,
     "default_theme": "light",
@@ -34,4 +35,4 @@
         "url": "https://${ELEMENT_CALL_FQDN}"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
-}
\ No newline at end of file
+}
diff --git a/data-template/synapse/homeserver.yaml b/data-template/synapse/homeserver.yaml
index c16b5fa..8e2d307 100644
--- a/data-template/synapse/homeserver.yaml
+++ b/data-template/synapse/homeserver.yaml
@@ -48,6 +48,7 @@ trusted_key_servers:
 # please keep config above this point as close as possible to the original generated config
 # so that upstream generated config changes can be detected
 
+public_baseurl: https://${HOMESERVER_FQDN}/
 suppress_key_server_warning: true
 
 send_federation: false
@@ -102,6 +103,9 @@ experimental_features:
     admin_token: '${SECRETS_MAS_MATRIX_SECRET}'
     account_management_url: "https://${MAS_FQDN}/account"
 
+  # QR login
+  msc4108_enabled: true
+
   # MSC3266: Room summary API. Used for knocking over federation
   msc3266_enabled: true
 
@@ -111,4 +115,4 @@ experimental_features:
 # Needed for MatrixRTC
 max_event_delay_duration: 24h
 
-# vim:ft=yaml
\ No newline at end of file
+# vim:ft=yaml