diff --git a/conf/homeserver.yaml b/conf/homeserver.yaml
index e92387b..bcbff09 100644
--- a/conf/homeserver.yaml
+++ b/conf/homeserver.yaml
@@ -1272,7 +1272,7 @@ enable_registration: __ALLOWED_ACCESS__
 # The user must provide all of the below types of 3PID when registering.
 #
 registrations_require_3pid:
- - email
+ - __REGISTRATIONS_REQUIRE_3PID__
 #  - msisdn
 
 # Explicitly disable asking for MSISDNs from the registration
@@ -1284,9 +1284,8 @@ disable_msisdn_registration: __DISABLE_MSISDN_REGISTRATION__
 # 3PIDs with accounts on this server.
 #
 allowed_local_3pids:
-__ALLOWED_LOCAL_3PIDS__
-#  - medium: email
-#    pattern: '^[^@]+@matrix\.org$'
+  - medium: __REGISTRATIONS_REQUIRE_3PID__
+    pattern: __ALLOWED_LOCAL_3PIDS__
 #  - medium: email
 #    pattern: '^[^@]+@vector\.im$'
 #  - medium: msisdn
@@ -1396,8 +1395,7 @@ account_threepid_delegates:
 # room. The join rule of the room must be set to 'public'.
 #
 auto_join_rooms:
-__AUTO_JOIN_ROOMS__
-#  - "#example:example.com"
+  - "__AUTO_JOIN_ROOMS__"
 
 # Where auto_join_rooms are specified, setting this flag ensures that the
 # the rooms exist by creating them when the first user on the
diff --git a/scripts/install b/scripts/install
index 9655eef..c751e2d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -105,12 +105,12 @@ fi
 allow_public_rooms_without_auth="false"
 allow_public_rooms_over_federation="false"
 disable_msisdn_registration="true"
-allowed_local_3pids=""
-#  - medium: email
-#    pattern: '^[^@]+@matrix\.org$'
+registrations_require_3pid="email"
+# here we need sed magic to transform $server_name
+allowed_local_3pids="'^[^@]+@""matrix""\.org$'"
 allow_guest_access="false"
 default_identity_server="https://matrix.org"
-auto_join_rooms='  - "#auto_join_room:'+$server_name+'"'
+auto_join_rooms="#auto_join_room:""$server_name"
 autocreate_auto_join_rooms="false"
 auto_join_rooms_for_guests="true"
 password_enabled="true"
@@ -122,6 +122,7 @@ ynh_app_setting_set --app=$app --key=element_ynh_url --value=$element_ynh_url
 ynh_app_setting_set --app=$app --key=allow_public_rooms_without_auth --value=$allow_public_rooms_without_auth
 ynh_app_setting_set --app=$app --key=allow_public_rooms_over_federation --value=$allow_public_rooms_over_federation
 ynh_app_setting_set --app=$app --key=disable_msisdn_registration --value=$disable_msisdn_registration
+ynh_app_setting_set --app=$app --key=registrations_require_3pid --value=$registrations_require_3pid
 ynh_app_setting_set --app=$app --key=allowed_local_3pids --value=$allowed_local_3pids
 ynh_app_setting_set --app=$app --key=allow_guest_access --value=$allow_guest_access
 ynh_app_setting_set --app=$app --key=default_identity_server --value=$default_identity_server
diff --git a/scripts/upgrade b/scripts/upgrade
index 8333d15..f22085e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -64,6 +64,7 @@ element_ynh_url=$(ynh_app_setting_get --app=$app --key=element_ynh_url)
 allow_public_rooms_without_auth=$(ynh_app_setting_get --app=$app --key=allow_public_rooms_without_auth)
 allow_public_rooms_over_federation=$(ynh_app_setting_get --app=$app --key=allow_public_rooms_over_federation)
 disable_msisdn_registration=$(ynh_app_setting_get --app=$app --key=disable_msisdn_registration)
+registrations_require_3pid=$(ynh_app_setting_get --app=$app --key=registrations_require_3pid)
 allowed_local_3pids=$(ynh_app_setting_get --app=$app --key=allowed_local_3pids)
 allow_guest_access=$(ynh_app_setting_get --app=$app --key=allow_guest_access)
 default_identity_server=$(ynh_app_setting_get --app=$app --key=default_identity_server)
@@ -216,9 +217,14 @@ then
   disable_msisdn_registration="true"
   ynh_app_setting_set --app=$app --key=disable_msisdn_registration --value=$disable_msisdn_registration
 fi
+if [ -z "$registrations_require_3pid" ]
+then
+  registrations_require_3pid="email"
+  ynh_app_setting_set --app=$app --key=registrations_require_3pid --value=$registrations_require_3pid
+fi
 if [ -z "$allowed_local_3pids" ]
 then
-  allowed_local_3pids=""
+  allowed_local_3pids="'^[^@]+@""matrix""\.org$'"
   ynh_app_setting_set --app=$app --key=allowed_local_3pids --value=$allowed_local_3pids
 fi
 if [ -z "$allow_guest_access" ]
@@ -233,7 +239,7 @@ then
 fi
 if [ -z "$auto_join_rooms" ]
 then
-  auto_join_rooms='  - "#auto_join_room:'+$server_name+'"'
+  auto_join_rooms="#auto_join_room:""$server_name"
   ynh_app_setting_set --app=$app --key=auto_join_rooms --value=$auto_join_rooms
 fi
 if [ -z "$autocreate_auto_join_rooms" ]