diff --git a/conf/.env b/conf/.env
new file mode 100644
index 0000000..edc1b98
--- /dev/null
+++ b/conf/.env
@@ -0,0 +1,5 @@
+# This setting allows to fix the homeserver.
+# If you set this setting, the user will not be able to select
+# the server and have to use synapse-admin with this server.
+
+REACT_APP_SERVER=https://__SYNAPSE_DOMAIN__
\ No newline at end of file
diff --git a/conf/systemd.service b/conf/systemd.service
index 5e99098..679d91d 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -9,7 +9,7 @@ Group=__APP__
 WorkingDirectory=__FINALPATH__
 Environment="PATH=__ENV_PATH__"
 Environment="NODE_ENV=production"
-ExecStart=/usr/bin/yarn build -p __PORT__
+ExecStart=/usr/bin/yarn start -p __PORT__
 Restart=always
 
 [Install]
diff --git a/scripts/install b/scripts/install
index b0b94aa..5584a79 100644
--- a/scripts/install
+++ b/scripts/install
@@ -23,7 +23,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url="/"
 is_public=$YNH_APP_ARG_IS_PUBLIC
-
+synapse_domain=$(yunohost app setting synapse domain)
 app=$YNH_APP_INSTANCE_NAME
 
 #=================================================