diff --git a/Vagrantfile b/Vagrantfile
index bbc38d6dd2c3a7f1fac0f8c19c5b980c7523b86c..ed8a35d9366e885de36ad487167fbcb09d07d44a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -44,10 +44,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       core.vm.network :private_network, ip: "#{BASE_IP_ADDR}.#{i+1}"
       core.vm.synced_folder ".", "/data/indiehosters", id: "coreos-indiehosters", :nfs => true, :mount_options => ['nolock,vers=3,udp']
       core.vm.provision :file, source: "./cloud-config", destination: "/tmp/vagrantfile-user-data"
+      core.vm.provision :shell, inline: "mkdir -p /data/server-wide/haproxy/approved-certs; cp /data/indiehosters/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
       core.vm.provision :shell, path: "./scripts/setup.sh", args: [HOSTNAME]
-      core.vm.provision :shell, inline: "cp /data/indiehosters/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
-      core.vm.provision :shell, inline: "etcdctl set /services/default '{\"app\":\"nginx\", \"hostname\":\"#{HOSTNAME}\"}'"
-      core.vm.provision :shell, path: "./scripts/activate-user.sh", args: [HOSTNAME, "nginx"]
     end
   end
 end
diff --git a/scripts/setup.sh b/scripts/setup.sh
index ed35b6d9073e4039d86eb941136b5aaf1b0b21b7..a57a8fb928a0e39724d3d09142e43b02577fae32 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -16,12 +16,15 @@ docker pull indiehosters/postfix-forwarder
 docker pull indiehosters/nginx
 
 # Activate default domain
+sh /data/indiehosters/scripts/activate-user.sh $1 nginx
 etcdctl set /services/default '{"app":"nginx", "hostname":"'$1'"}'
 
 # Configure and start HAproxy
 mkdir -p /data/server-wide/haproxy/approved-certs
-systemctl enable haproxy.service
-systemctl start  haproxy.service
+systemctl enable haproxy-confd.service
+systemctl start  haproxy-confd.service
+systemctl enable haproxy.path
+systemctl start  haproxy.path
 
 # Configure and start postfix
 mkdir -p /data/server-wide/postfix