diff --git a/README.md b/README.md
index 626a425..0bbab04 100644
--- a/README.md
+++ b/README.md
@@ -20,17 +20,18 @@ work).
 vagrant up
 ```
 
-Wait for the provisioning to finish (~12mins), and go to your browser: https://indiehosters.dev
+Wait for the provisioning to finish (~40mins), and go to your browser: https://indiehosters.dev
 
 If the process fails, for instance due to network problems, you can retry by running `vagrant provision`.
 
-### If you want to add another static instance apart from indiehosters.dev:
+### Set up a domain:
 
 ```bash
-vagrant ssh
+vagrant ssh core-1
 sudo mkdir -p /data/import/example.dev/TLS
 sudo cp /data/indiehosters/scripts/unsecure-certs/example.dev.pem /data/import/example.dev/TLS
 sudo systemctl start static@example.dev
+sudo systemctl restart haproxy-confd
 ```
 
 Check https://example.dev in your bowser!
@@ -49,8 +50,8 @@ vagrant up
 ```bash
 vagrant destroy
 vagrant up
-# Check in your browser https://indiehosters.dev
-vagrant ssh
+# Check in your browser https://example.dev
+vagrant ssh core-1
 sudo su
-/data/indiehosters/scripts/tests/main.sh
+/data/indiehosters/tests/main.sh
 ```
diff --git a/doc/running-on-ubuntu.md b/doc/running-on-ubuntu.md
index 26c2cb8..41b34e0 100644
--- a/doc/running-on-ubuntu.md
+++ b/doc/running-on-ubuntu.md
@@ -5,7 +5,7 @@ apt-get update && apt-get -y upgrade && apt-get -y dist-upgrade
 dpkg-reconfigure -plow unattended-upgrades
 # set unattended upgrades to 'Yes'
 apt-get -y install systemd-sysv git docker.io
-printf "#!/bin/sh\ndocker run --net=host quay.io/coreos/etcd:v0.4.6 /etcdctl $1 $2 $3 $4" >> /usr/local/etcdctl
+printf '#!/bin/sh\ndocker run --net=host quay.io/coreos/etcd:v0.4.6 /etcdctl $1 $2 $3 $4' > /usr/local/bin/etcdctl
 printf "[Unit]\nRequires=docker.service\nAfter=docker.service\n[Service]\nRestart=always\n\
 ExecStartPre=-/usr/bin/docker kill etcd\n\
 ExecStartPre=-/usr/bin/docker rm etcd\n\
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 6ef2c23..6a9ac8e 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -21,7 +21,7 @@ docker pull indiehosters/mysql
 docker pull indiehosters/wordpress
 
 # Install unit-files
-cp /data/indiehosters/unit-files/* /etc/systemd/system && systemctl daemon-reload
+sudo cp /data/indiehosters/unit-files/* /etc/systemd/system && systemctl daemon-reload
 
 # Create Directory structure
 mkdir -p /data/domains