diff --git a/xo_install.sh b/xo_install.sh
index b0045cf..c08540b 100644
--- a/xo_install.sh
+++ b/xo_install.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-xo_branch="stable"
-xo_server="https://github.com/vatesfr/xo-server"
+xo_branch="master"
+xo_server="https://github.com/vatesfr/xen-orchestra"
 xo_web="https://github.com/vatesfr/xo-web"
 n_repo="https://raw.githubusercontent.com/visionmedia/n/master/bin/n"
 yarn_repo="deb https://dl.yarnpkg.com/debian/ stable main"
-node_source="https://deb.nodesource.com/setup_5.x"
+node_source="https://deb.nodesource.com/setup_9.x"
 yarn_gpg="https://dl.yarnpkg.com/debian/pubkey.gpg"
 n_location="/usr/local/bin/n"
-xo_server_dir="/opt/xo-server"
+xo_server_dir="/opt/xen-orchestra"
 xo_web_dir="/opt/xo-web"
 systemd_service_dir="/lib/systemd/system"
 xo_service="xo-server.service"
@@ -32,12 +32,18 @@ sudo /usr/bin/apt-get install --yes build-essential redis-server libpng-dev git
 
 /usr/bin/git clone -b $xo_branch $xo_server
 /usr/bin/git clone -b $xo_branch $xo_web
+
+# Patch to allow config restore
+sed -i 's/< 5/> 0/g' /opt/xo-web/src/xo-app/settings/config/index.js
+
 cd $xo_server_dir
 /usr/bin/yarn 
 /usr/bin/yarn build
+cd packages/xo-server
 sudo cp sample.config.yaml .xo-server.yaml
 sudo sed -i "s|#'/': '/path/to/xo-web/dist/'|'/': '/opt/xo-web/dist'|" .xo-server.yaml
 cd $xo_web_dir
+
 /usr/bin/yarn 
 /usr/bin/yarn build
 
@@ -51,7 +57,7 @@ Description= XO Server
 After=network-online.target
 
 [Service]
-WorkingDirectory=/opt/xo-server/
+WorkingDirectory=/opt/xen-orchestra/packages/xo-server/
 ExecStart=/usr/local/bin/node ./bin/xo-server
 Restart=always
 SyslogIdentifier=xo-server