diff --git a/etcd-2.0/Vagrantfile b/etcd-2.0/Vagrantfile
index b1869a0..c9495bc 100644
--- a/etcd-2.0/Vagrantfile
+++ b/etcd-2.0/Vagrantfile
@@ -17,7 +17,12 @@ require 'erb'
 
 # Use config from YAML file to write out templates for etcd overrides
 template = File.join(File.dirname(__FILE__), 'etcd.defaults.erb')
-  content = ERB.new File.new(template).read
+content = ERB.new File.new(template).read
+
+etcd_initial_cluster = []
+servers.each do |servers|
+  etcd_initial_cluster << "#{servers['name']}=http://#{servers['priv_ip']}:2380"
+end
 servers.each do |servers|
   ip = servers['priv_ip']
   target = File.join(File.dirname(__FILE__), "#{servers['name']}.defaults")
diff --git a/etcd-2.0/etcd.defaults.erb b/etcd-2.0/etcd.defaults.erb
index 0a5ae17..6cc2f89 100644
--- a/etcd-2.0/etcd.defaults.erb
+++ b/etcd-2.0/etcd.defaults.erb
@@ -1,7 +1,7 @@
 # Override file for etcd Upstart script
 # Generated from etcd.override.erb by Vagrant
 # Environment variables
-export ETCD_INITIAL_CLUSTER="etcd-01=http://192.168.101.101:2380,etcd-02=http://192.168.101.102:2380,etcd-03=http://192.168.101.103:2380"
+export ETCD_INITIAL_CLUSTER="<%= etcd_initial_cluster.join(',') %>"
 export ETCD_INITIAL_CLUSTER_STATE="new"
 export ETCD_INITIAL_CLUSTER_TOKEN="etcd-cluster-01"
 export ETCD_INITIAL_ADVERTISE_PEER_URLS="http://<%= servers['priv_ip'] %>:2380"
diff --git a/etcd-2.0/servers.yml b/etcd-2.0/servers.yml
index 77a4619..26b89e6 100644
--- a/etcd-2.0/servers.yml
+++ b/etcd-2.0/servers.yml
@@ -10,7 +10,7 @@
   vcpu: 1
   priv_ip: 192.168.101.102
 - name: etcd-03
-  box: ubuntu-trusty
+  box: slowe/ubuntu-trusty-x64
   ram: 512
   vcpu: 1
-  priv_ip: slowe/ubuntu-trusty-x64
+  priv_ip: 192.168.101.103