diff --git a/README.md b/README.md
index 1826087..d3bbaf6 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The HopGlass Server collects data from Freifunk networks and processes it to be
 
 **i.e. Debian Jessie or newer, Ubuntu 15.04 or newer**
 
-1. Run `$ curl -sL https://raw.githubusercontent.com/plumpudding/hopglass-server/master/scripts/bootstrap.sh | sudo -E bash -`
+1. Run `$ curl -sL https://raw.githubusercontent.com/plumpudding/hopglass-server/0.1rc1/scripts/bootstrap.sh | sudo -E bash -`
 2. Review and edit the default configuration located at `/etc/hopglass-server/default/config.json`.
 3. Start the HopGlass Server: `$ sudo systemctl start hopglass-server@default`
 4. (Optional) Automatically start the HopGlass Server at boot: `$ sudo systemctl enable hopglass-server@default`
diff --git a/systemd/hopglass-server@.service b/hopglass-server@.service
similarity index 73%
rename from systemd/hopglass-server@.service
rename to hopglass-server@.service
index 0447265..408128d 100644
--- a/systemd/hopglass-server@.service
+++ b/hopglass-server@.service
@@ -5,8 +5,8 @@ Description=The HopGlass Server collects data from the Freifunk network (%I)
 Type=simple
 User=hopglass
 Group=hopglass
-WorkingDirectory=/opt/hopglass/server
-ExecStart=/usr/bin/node --harmony /opt/hopglass/server/hopglass-server.js --config /etc/hopglass-server/%I/config.json
+WorkingDirectory=/etc/hopglass-server/%I/
+ExecStart=/usr/bin/node --harmony /opt/hopglass/server/hopglass-server.js
 Restart=always
 
 [Install]
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 7067a0f..8cce332 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -15,7 +15,7 @@ adduser --system --home=$INSTALL_DIR --group hopglass
 
 #Clone and install dependencies
 su - hopglass --shell /bin/bash
-git clone https://github.com/plumpudding/hopglass-server server
+git clone https://github.com/plumpudding/hopglass-server -b 0.1rc1 server
 cd server
 npm install
 exit
@@ -23,7 +23,7 @@ exit
 #Symlink systemd service and copy config file:
 mkdir -p /etc/hopglass-server/default
 cp $INSTALL_DIR/server/config.json.example /etc/hopglass-server/default/config.json
-ln -s $INSTALL_DIR/server/systemd/hopglass-server@.service /etc/systemd/system/hopglass-server@.service
+ln -s $INSTALL_DIR/server/hopglass-server@.service /etc/systemd/system/hopglass-server@.service
 
 echo 
 echo '######################################################'