diff --git a/Vagrantfile b/Vagrantfile
index 0a03b2c860c12486a0f59a5975dc4e9d55be5729..dcaab64b37623c0852085f74d6137c62913a89dd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -45,7 +45,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       core.vm.synced_folder ".", "/data/infrastructure", id: "coreos-infrastructure", :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: "cp /data/infrastructure/scripts/unsecure-certs/*.pem /data/server-wide/haproxy/approved-certs"
-      core.vm.provision :shell, path: "./scripts/setup.sh"
+      core.vm.provision :shell, path: "./scripts/setup.sh", args: [HOSTNAME]
       core.vm.provision :shell, inline: "etcdctl set /services/default '{\"app\":\"nginx\", \"hostname\":\"#{HOSTNAME}\"}'"
       core.vm.provision :shell, path: "./scripts/approve-user.sh", args: [HOSTNAME, "nginx"]
     end
diff --git a/scripts/setup.sh b/scripts/setup.sh
index bed787010f475ca2b791f07dccd36b05f37c8e6f..442336005159faa94bfb7b4644103ca0dd368eaf 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -16,7 +16,7 @@ docker pull indiehosters/wordpress
 docker pull indiehosters/nginx
 
 # Activate default domain
-etcdctl set /services/default '{"app":"nginx", "hostname":"`hostname`"}'
+etcdctl set /services/default '{"app":"nginx", "hostname":"'$1'"}'
 
 # Configure and start HAproxy
 mkdir -p /data/server-wide/haproxy/approved-certs