diff --git a/.gitignore b/.gitignore
index a6974b8..7bc08b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 # vagrant data directories
 cluster/.vagrant
+cluster/.etc_hosts
+cluster/.cfg.yml
diff --git a/Makefile b/Makefile
index e40423f..f9a1b76 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ release:
 
 # Brings up a demo cluster to install Contiv on - by default this is a docker, centos cluster.
 # It can be configured to start a RHEL cluster by setting CONTIV_NODE_OS=rhel7.
-# It can be started with k8s kubeadm install by running with VAGRANT_USE_KUBEADM=1.
+# It can be started with k8s kubeadm install by running with CONTIV_KUBEADM=1.
 cluster: cluster-destroy
 	cd cluster && vagrant up
 
@@ -20,20 +20,27 @@ cluster-destroy:
 # demo-k8s brings up a cluster with k8s, runs the installer on it, and shows the URL
 # of the demo Contiv Admin Console which was set up
 demo-k8s:
-	@bash ./scripts/demo-k8s.sh
+	CONTIV_KUBEADM=1 make cluster
+	BUILD_VERSION=1.0.0-beta.2 make install-test-kubeadm
+
+# demo-swarm brings up a cluster with docker swarm, runs the installer on it, and shows the URL
+# of the demo Contiv Admin Console which was set up
+demo-swarm:
+	make cluster
+	BUILD_VERSION=1.0.0-beta.2 make install-test-swarm
 
 # Create a release and test the release installation on a vagrant cluster
 # TODO: The vagrant part of this can be optimized by taking snapshots instead
 # of creating a new set of VMs for each case
 release-test-kubeadm: release 
 	# Test kubeadm (centos by default)
-	VAGRANT_USE_KUBEADM=1 make cluster
-	VAGRANT_USE_KUBEADM=1 make install-test-kubeadm
+	CONTIV_KUBEADM=1 make cluster
+	CONTIV_KUBEADM=1 make install-test-kubeadm
 
 release-test-swarm: release 
 	# Test swarm (centos by default)
-	CLUSTER_CONFIG='cluster_defs_ansible.json' make cluster
-	CLUSTER_CONFIG='cluster_defs_ansible.json' make install-test-swarm
+	make cluster
+	make install-test-swarm
 
 release-test-kubelegacy: release 
 	# Test k8s ansible (centos by default)
diff --git a/QUICKSTART.md b/QUICKSTART.md
new file mode 100644
index 0000000..84cda8f
--- /dev/null
+++ b/QUICKSTART.md
@@ -0,0 +1,32 @@
+# Quick Start Guide
+
+## Pre-requisites
+
+* [Install Virtual Box 5.1.14 or later]( https://www.virtualbox.org/wiki/Downloads )
+* [Install Vagrant 1.9.1 or later]( https://www.vagrantup.com/downloads.html )
+* [Install Docker 1.12 or later]( https://docs.docker.com/engine/installation/ )
+* Clone the Contiv install repository <br>
+`git clone http://github.com/contiv/install'
+
+## Setup the cluster with Contiv for Kubernetes
+`make demo-k8s`
+
+## Setup the cluster with Contiv for Docker with Swarm
+`make demo-swarm`
+
+## Customizing the setup
+
+* The default configuration creates a 2 node cluster. To increase the number of nodes set the environment variable `CONTIV_NODES=<n>`
+
+## Quick Start Guide for CentOS 7.x hosts
+
+* Setup the pre-requisites as follows and follow the demo instructions above
+```
+ wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.rpm
+ wget http://download.virtualbox.org/virtualbox/5.1.14/VirtualBox-5.1-5.1.14_112924_el7-1.x86_64.rpm
+ sudo yum install VirtualBox-5.1-5.1.14_112924_el7-1.x86_64.rpm -y
+ sudo yum install vagrant_1.9.1_x86_64.rpm -y
+ sudo yum install docker -y
+ sudo systemctl start docker
+ git clone http://github.com/contiv/install
+```
diff --git a/cluster/Vagrantfile b/cluster/Vagrantfile
index f7b7194..61be40c 100755
--- a/cluster/Vagrantfile
+++ b/cluster/Vagrantfile
@@ -1,116 +1,137 @@
-# -*- mode: ruby -*-
+  # -*- mode: ruby -*-
 # vi: set ft=ruby :
 require 'rubygems'
-require 'json'
 require 'fileutils'
+require 'yaml'
 
 token = 'd900e1.8a392798f13b33a4'
 
 # method to create an etc_hosts file based on the cluster info
-def create_etc_hosts(cluster)
-  master_ip = '192.168.2.10'
+def create_etc_hosts(num_nodes, base_ip, start)
+  master_ip = base_ip + start.to_s
   hosts = "127.0.0.1   localhost\n"
-  cluster.each do |role, member_list|
-    hosts = member_list.inject(hosts) { |acc, elem| acc << "#{elem['contiv_control_ip']}   #{elem['name']}\n" }
-    if role == 'master' && member_list[0]
-      hosts << "#{member_list[0]['contiv_control_ip']}   netmaster\n"
-      master_ip = member_list[0]['contiv_control_ip']
-    end
-  end
+  hosts << "#{master_ip}   netmaster\n"
+  hosts = (0..num_nodes).inject(hosts) { |acc, elem| acc << base_ip + "#{elem + start} contiv-node#{elem + 1} \n" }
 
-  etc_file = (ENV['VAGRANT_CWD'] || '.') + '/export/.etc_hosts'
+  etc_file = (ENV['VAGRANT_CWD'] || '.') + '/.etc_hosts'
   File.write(etc_file, hosts)
   master_ip
 end
 
+# method to create an cfg file based on the cluster info
+def create_cfg_info(num_nodes, node_ips)
+  conn = {}
+  num_nodes.times do |n|
+    node_ip = node_ips[n]
+    node = if n.zero?
+             { 'role' => 'master' }
+           else
+             {}
+           end
+    node['control'] = ENV['CONTIV_CONTROL_IF'] || 'eth1'
+    node['data'] = ENV['CONTIV_DATA_IF'] || 'eth2'
+    conn[node_ip] = node
+  end
+  cfg_data = { 'CONNECTION_INFO' => conn }
+  cfg_file = (ENV['VAGRANT_CWD'] || '.') + '/.cfg.yml'
+  File.write(cfg_file, cfg_data.to_yaml)
+end
+
 provision_node = <<SCRIPT
 echo "export https_proxy='$2'" >> /etc/profile.d/envvar.sh
 echo "export http_proxy='$1'" >> ~/.profile
 echo "export https_proxy='$2'" >> ~/.profile
 source /etc/profile.d/envvar.sh
 sudo yum install -y net-tools
+echo $3 > /etc/hosts
 ifup eth1
 SCRIPT
 
 # begin execution here
-# read the cluster configuration and create /etc/hosts file
-config_file = ENV['CLUSTER_CONFIG'] || 'cluster_defs.json'
-cluster = JSON.parse(File.read((ENV['VAGRANT_CWD'] || '.') + '/' + config_file))
-master_ip = create_etc_hosts(cluster)
+num_nodes = 2
+if ENV['CONTIV_NODES'] && ENV['CONTIV_NODES'] != ''
+  num_nodes = ENV['CONTIV_NODES'].to_i
+end
+base_ip = '192.168.2.'
+if ENV['CONTIV_IP_PREFIX'] && ENV['CONTIV_IP_PREFIX'] != ''
+  base_ip = ENV['CONTIV_IP_PREFIX']
+end
+start = ENV['CONTIV_KUBEADM'] ? 50 : 50 + num_nodes
+name_start = ENV['CONTIV_KUBEADM'] ? 1 : 1 + num_nodes
+node_ips = Array.new(num_nodes) { |n| base_ip + (n + start).to_s }
+node_names = Array.new(num_nodes) { |n| "contiv-node#{n + name_start}" }
+
+master_ip = create_etc_hosts(num_nodes, base_ip, start)
+create_cfg_info(num_nodes, node_ips)
 
 VAGRANTFILE_API_VERSION = '2'.freeze
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.synced_folder './export', '/shared'
-  config.vm.provider 'virtualbox' do |v|
-    v.linked_clone = true if Vagrant::VERSION >= '1.8'
-  end
+  config.vm.box_check_update = false
+  config.vbguest.auto_update = false if Vagrant.has_plugin?('vagrant-vbguest')
   if ENV['CONTIV_NODE_OS'] && ENV['CONTIV_NODE_OS'] == 'rhel7'
     config.registration.manager = 'subscription_manager'
     config.registration.username = ENV['CONTIV_RHEL_USER']
     config.registration.password = ENV['CONTIV_RHEL_PASSWD']
   end
-  # config.ssh.password = 'vagrant'
-  config.ssh.insert_key = false
-  config.ssh.private_key_path = './export/insecure_private_key'
 
-  cluster.each do |role, member_list|
-    member_list.each do |member_info|
-      config.vm.define vm_name = member_info['name'] do |c|
-        if ENV['CONTIV_NODE_OS'] && ENV['CONTIV_NODE_OS'] == 'rhel7'
-          # Download rhel7.2 box from https://access.redhat.com/downloads/content/293/ver=2/rhel---7/2.0.0/x86_64/product-software
-          # Add it as rhel7 vagrant box add rhel-cdk-kubernetes-7.2-29.x86_64.vagrant-virtualbox.box --name=rhel7
-          c.vm.box = 'rhel7'
-        else
-          c.vm.box = 'centos/7'
-        end
-        c.vm.provision 'shell' do |s|
-          s.inline = provision_node
-          s.args = [ENV['http_proxy'] || '', ENV['https_proxy'] || '']
-        end
+  config.ssh.insert_key = false
+  num_nodes.times do |n|
+    node_name = node_names[n]
+    node_addr = node_ips[n]
+    config.vm.define vm_name = node_name do |c|
+      if ENV['CONTIV_NODE_OS'] && ENV['CONTIV_NODE_OS'] == 'rhel7'
+        # Download rhel7.2 box from https://access.redhat.com/downloads/content/293/ver=2/rhel---7/2.0.0/x86_64/product-software
+        # Add it as rhel7 vagrant box add rhel-cdk-kubernetes-7.2-29.x86_64.vagrant-virtualbox.box --name=rhel7
+        c.vm.box = 'rhel7'
+      else
+        c.vm.box = 'centos/7'
+      end
+      c.vm.provision 'shell' do |s|
+        s.inline = provision_node
+        etc_file = (ENV['VAGRANT_CWD'] || '.') + '/.etc_hosts'
+        hosts = File.read(etc_file)
+        s.args = [ENV['http_proxy'] || '', ENV['https_proxy'] || '', hosts]
+      end
 
-        # configure ip address etc
-        c.vm.hostname = vm_name
-        c.vm.network :private_network, ip: member_info['contiv_control_ip']
-        c.vm.network :private_network, ip: member_info['contiv_network_ip'], virtualbox__intnet: 'true', auto_config: false
-        c.vm.provider 'virtualbox' do |v|
-          v.memory = vm_name == 'contiv-master' ? 2048 : 1024
-          # make all nics 'virtio' to take benefit of builtin vlan tag
-          # support, which otherwise needs to be enabled in Intel drivers,
-          # which are used by default by virtualbox
-          v.customize ['modifyvm', :id, '--nictype1', 'virtio']
-          v.customize ['modifyvm', :id, '--nictype2', 'virtio']
-          v.customize ['modifyvm', :id, '--nictype3', 'virtio']
-          v.customize ['modifyvm', :id, '--nicpromisc2', 'allow-all']
-          v.customize ['modifyvm', :id, '--nicpromisc3', 'allow-all']
-          v.customize ['modifyvm', :id, '--paravirtprovider', 'kvm']
-        end # v
+      # configure ip address etc
+      c.vm.hostname = vm_name
+      c.vm.network :private_network, ip: node_addr
+      c.vm.network :private_network, ip: node_addr, virtualbox__intnet: 'true', auto_config: false
+      if n.zero?
+        c.vm.network 'forwarded_port', guest: 10_000, host: 10_005 + node_addr.split('.')[3].to_i
+      end
+      c.vm.provider 'virtualbox' do |v|
+        # kube api server node is super slow with just 1GB RAM, so give it more
+        v.memory = ENV['CONTIV_KUBEADM'] && n.zero? ? 2048 : 1024
+        # make all nics 'virtio' to take benefit of builtin vlan tag
+        # support, which otherwise needs to be enabled in Intel drivers,
+        # which are used by default by virtualbox
+        v.customize ['modifyvm', :id, '--nictype1', 'virtio']
+        v.customize ['modifyvm', :id, '--nictype2', 'virtio']
+        v.customize ['modifyvm', :id, '--nictype3', 'virtio']
+        v.customize ['modifyvm', :id, '--nicpromisc2', 'allow-all']
+        v.customize ['modifyvm', :id, '--nicpromisc3', 'allow-all']
+        v.customize ['modifyvm', :id, '--paravirtprovider', 'kvm']
+      end # v
 
+      if ENV['CONTIV_KUBEADM']
         c.vm.provision 'shell', inline: <<-EOS
-          #copy the etc_hosts file we created
-          sudo cp /shared/.etc_hosts /etc/hosts
-          EOS
-        if ENV['VAGRANT_USE_KUBEADM']
-          c.vm.provision 'shell', inline: <<-EOS
             sudo setenforce 0
             sudo systemctl stop firewalld
             sudo /etc/init.d/network restart
-            #copy the etc_hosts file we created
-            sudo cp /shared/.etc_hosts /etc/hosts
             EOS
-          c.vm.provision :shell, path: 'bootstrap_centos.sh'
-          if role == 'master'
-            # Install kubernetes on master
-            ks8_ver = ENV['CONTIV_K8s_VERSION'] || 'v1.4.7'
-            c.vm.provision :shell, path: 'k8smaster_centos.sh', args: [token, member_info['contiv_control_ip'], ks8_ver]
-          else
-            # Install kubernetes on nodes
-            c.vm.provision :shell, path: 'k8sworker_centos.sh', args: [token, master_ip]
-          end # if
+        c.vm.provision :shell, path: 'bootstrap_centos.sh'
+        if n.zero?
+          # Install kubernetes on master
+          ks8_ver = ENV['CONTIV_K8s_VERSION'] || 'v1.4.7'
+          c.vm.provision :shell, path: 'k8smaster_centos.sh', args: [token, node_addr, ks8_ver]
         else
-          c.vm.provision :shell, inline: 'yum install policycoreutils-python -y'
-        end
-      end # c
-    end # member_info
+          # Install kubernetes on nodes
+          c.vm.provision :shell, path: 'k8sworker_centos.sh', args: [token, master_ip]
+        end # if
+      else
+        c.vm.provision :shell, inline: 'yum install policycoreutils-python -y'
+      end
+    end # c
   end # role
 end # config
-#
diff --git a/cluster/cluster_defs.json b/cluster/cluster_defs.json
deleted file mode 100755
index 14b4491..0000000
--- a/cluster/cluster_defs.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"master": [{"name": "contiv-master", "management_ip": "192.168.2.10", "contiv_control_if": "eth1", "contiv_control_ip": "192.168.2.10", "contiv_network_if": "eth2", "contiv_network_ip": "10.1.1.10"}],
- "nodes" : [{"name": "contiv-node-01", "management_ip": "192.168.2.11", "contiv_control_if": "eth1", "contiv_control_ip": "192.168.2.11", "contiv_network_if": "eth2", "contiv_network_ip": "10.1.1.11", "max_pods": "40"}]
-}
diff --git a/cluster/cluster_defs_ansible.json b/cluster/cluster_defs_ansible.json
deleted file mode 100755
index 270a7c6..0000000
--- a/cluster/cluster_defs_ansible.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{"master": [{"name": "contiv-master1", "management_ip": "192.168.2.12", "contiv_control_if": "eth1", "contiv_control_ip": "192.168.2.12", "contiv_network_if": "eth2", "contiv_network_ip": "10.1.1.12"}],
- "nodes" : [{"name": "contiv-node-011", "management_ip": "192.168.2.13", "contiv_control_if": "eth1", "contiv_control_ip": "192.168.2.13", "contiv_network_if": "eth2", "contiv_network_ip": "10.1.1.13", "max_pods": "40"}]
-}
diff --git a/cluster/export/docker-tcp.socket b/cluster/export/docker-tcp.socket
deleted file mode 100644
index e0fbe71..0000000
--- a/cluster/export/docker-tcp.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Docker Socket for the API
-
-[Socket]
-ListenStream=2385
-BindIPv6Only=both
-Service=docker.service
-
-[Install]
-WantedBy=sockets.target
diff --git a/cluster/export/docker.service b/cluster/export/docker.service
deleted file mode 100644
index 495170c..0000000
--- a/cluster/export/docker.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=https://docs.docker.com
-After=network.target docker.socket
-Requires=docker.socket
-
-[Service]
-TimeoutStartSec=5m
-Type=notify
-ExecStart=/usr/bin/docker daemon -H fd:// --cluster-store=etcd://localhost:2379
-MountFlags=shared
-LimitNOFILE=1048576
-LimitNPROC=1048576
-LimitCORE=infinity
-
-[Install]
-WantedBy=multi-user.target
diff --git a/cluster/export/insecure_private_key b/cluster/export/insecure_private_key
deleted file mode 100644
index 7d6a083..0000000
--- a/cluster/export/insecure_private_key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzI
-w+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoP
-kcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2
-hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NO
-Td0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcW
-yLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQIBIwKCAQEA4iqWPJXtzZA68mKd
-ELs4jJsdyky+ewdZeNds5tjcnHU5zUYE25K+ffJED9qUWICcLZDc81TGWjHyAqD1
-Bw7XpgUwFgeUJwUlzQurAv+/ySnxiwuaGJfhFM1CaQHzfXphgVml+fZUvnJUTvzf
-TK2Lg6EdbUE9TarUlBf/xPfuEhMSlIE5keb/Zz3/LUlRg8yDqz5w+QWVJ4utnKnK
-iqwZN0mwpwU7YSyJhlT4YV1F3n4YjLswM5wJs2oqm0jssQu/BT0tyEXNDYBLEF4A
-sClaWuSJ2kjq7KhrrYXzagqhnSei9ODYFShJu8UWVec3Ihb5ZXlzO6vdNQ1J9Xsf
-4m+2ywKBgQD6qFxx/Rv9CNN96l/4rb14HKirC2o/orApiHmHDsURs5rUKDx0f9iP
-cXN7S1uePXuJRK/5hsubaOCx3Owd2u9gD6Oq0CsMkE4CUSiJcYrMANtx54cGH7Rk
-EjFZxK8xAv1ldELEyxrFqkbE4BKd8QOt414qjvTGyAK+OLD3M2QdCQKBgQDtx8pN
-CAxR7yhHbIWT1AH66+XWN8bXq7l3RO/ukeaci98JfkbkxURZhtxV/HHuvUhnPLdX
-3TwygPBYZFNo4pzVEhzWoTtnEtrFueKxyc3+LjZpuo+mBlQ6ORtfgkr9gBVphXZG
-YEzkCD3lVdl8L4cw9BVpKrJCs1c5taGjDgdInQKBgHm/fVvv96bJxc9x1tffXAcj
-3OVdUN0UgXNCSaf/3A/phbeBQe9xS+3mpc4r6qvx+iy69mNBeNZ0xOitIjpjBo2+
-dBEjSBwLk5q5tJqHmy/jKMJL4n9ROlx93XS+njxgibTvU6Fp9w+NOFD/HvxB3Tcz
-6+jJF85D5BNAG3DBMKBjAoGBAOAxZvgsKN+JuENXsST7F89Tck2iTcQIT8g5rwWC
-P9Vt74yboe2kDT531w8+egz7nAmRBKNM751U/95P9t88EDacDI/Z2OwnuFQHCPDF
-llYOUI+SpLJ6/vURRbHSnnn8a/XG+nzedGH5JGqEJNQsz+xT2axM0/W/CRknmGaJ
-kda/AoGANWrLCz708y7VYgAtW2Uf1DPOIYMdvo6fxIB5i9ZfISgcJ/bbCUkFrhoH
-+vq/5CIWxCPp0f85R4qxxQ5ihxJ0YDQT9Jpx4TMss4PSavPaBH3RXow5Ohe+bYoQ
-NE5OgEXk2wVfZczCZpigBKbKZHNYcelXtTt/nP3rsCuGcM4h53s=
------END RSA PRIVATE KEY-----
diff --git a/install/ansible/cfg.yml b/install/ansible/cfg.yml
index 154d6fe..b9fc315 100644
--- a/install/ansible/cfg.yml
+++ b/install/ansible/cfg.yml
@@ -1,8 +1,8 @@
 CONNECTION_INFO:
-  192.168.2.12:
+  192.168.2.52:
         role: master
         control: eth1
         data: eth2
-  192.168.2.13:
+  192.168.2.53:
         control: eth1
         data: eth2
diff --git a/install/ansible/install_swarm.sh b/install/ansible/install_swarm.sh
index 06c6e0c..cf296e2 100755
--- a/install/ansible/install_swarm.sh
+++ b/install/ansible/install_swarm.sh
@@ -144,9 +144,9 @@ fi
 
 echo "Starting the installer container"
 image_name="contiv/install:__CONTIV_INSTALL_VERSION__"
-install_mount="-v $(pwd)/install:/install"
-ansible_mount="-v $(pwd)/ansible:/ansible"
-config_mount="-v $src_conf_path:$container_conf_path"
-cache_mount="-v $(pwd)/contiv_cache:/var/contiv_cache"
+install_mount="-v $(pwd)/install:/install:Z"
+ansible_mount="-v $(pwd)/ansible:/ansible:Z"
+config_mount="-v $src_conf_path:$container_conf_path:Z"
+cache_mount="-v $(pwd)/contiv_cache:/var/contiv_cache:Z"
 mounts="$install_mount $ansible_mount $cache_mount $config_mount"
 docker run --rm $mounts $image_name sh -c "./install/ansible/install.sh $netmaster_param -a \"$ans_opts\" $install_scheduler -m $contiv_network_mode -d $fwd_mode $aci_param"
diff --git a/install/ansible/uninstall_swarm.sh b/install/ansible/uninstall_swarm.sh
index 25d2050..eb9656d 100755
--- a/install/ansible/uninstall_swarm.sh
+++ b/install/ansible/uninstall_swarm.sh
@@ -129,9 +129,9 @@ fi
 ans_opts="$ans_opts --private-key $def_ans_key -u $ans_user"
 echo "Starting the uninstaller container"
 image_name="contiv/install:__CONTIV_INSTALL_VERSION__"
-install_mount="-v $(pwd)/install:/install"
-ansible_mount="-v $(pwd)/ansible:/ansible"
-config_mount="-v $src_conf_path:$container_conf_path"
-cache_mount="-v $(pwd)/contiv_cache:/var/contiv_cache"
+install_mount="-v $(pwd)/install:/install:Z"
+ansible_mount="-v $(pwd)/ansible:/ansible:Z"
+config_mount="-v $src_conf_path:$container_conf_path:Z"
+cache_mount="-v $(pwd)/contiv_cache:/var/contiv_cache:Z"
 mounts="$install_mount $ansible_mount $cache_mount $config_mount"
 docker run --rm $mounts $image_name sh -c "./install/ansible/uninstall.sh $netmaster_param -a \"$ans_opts\" $uninstall_scheduler -m $contiv_network_mode -d $fwd_mode $aci_param $reset_params"
diff --git a/install/install.sh b/install/install.sh
deleted file mode 100644
index 9da9fa2..0000000
--- a/install/install.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Load the docker images locally
-# TODO: This should eventually be a noop, once we have things on the docker hub or else where
-docker load -i contiv-install-image.tar
diff --git a/scripts/demo-k8s.sh b/scripts/demo-k8s.sh
deleted file mode 100755
index 0eb5d6f..0000000
--- a/scripts/demo-k8s.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-release="${CONTIV_RELEASE_VER:-1.0.0-beta.2}"
-svc_ip="${MASTER_IP:-192.168.2.10}"
-url="https://${svc_ip}:10000" # master_ip copied from Vagrantfile
-default_net_cidr="${DEFAULT_NET:-20.1.1.0/24}"
-
-VAGRANT_USE_KUBEADM=1 make cluster
-
-set +e # read returns 1 when it succeeds
-read -r -d '' COMMANDS <<-EOF
-    # github redirects you to a signed AWS URL, so we need to follow redirects with -L \\
-    curl -L -O https://github.com/contiv/install/releases/download/${release}/contiv-${release}.tgz && \\
-    tar xf contiv-${release}.tgz && \\
-    cd contiv-${release} && \\
-    sudo ./install/k8s/install.sh -n ${svc_ip}
-EOF
-set -e
-
-cd cluster
-vagrant ssh contiv-master -- "$COMMANDS"
-
-set +e
-read -r -d '' SETUP_DEFAULT_NET <<-EOF
-    cd contiv-${release} && \\
-    sudo netctl net create -s ${default_net_cidr} default-net
-EOF
-set -e
-
-echo
-echo "Waiting 30 seconds ..."
-sleep 30
-echo
-echo "Creating default network"
-vagrant ssh contiv-master -- "${SETUP_DEFAULT_NET}"
-
-echo
-echo "Contiv Admin Console is available at:"
-echo ""
-echo "	$url"
-echo ""
-cat <<EOF
-NOTE: Because the Contiv Admin Console is using a self-signed certificate for this demo,
-      you will see a security warning when the page loads.  You can safely dismiss it.
-EOF
-
diff --git a/scripts/kube_legacy_test.sh b/scripts/kube_legacy_test.sh
index 6f5b8e7..ebb34bc 100644
--- a/scripts/kube_legacy_test.sh
+++ b/scripts/kube_legacy_test.sh
@@ -11,4 +11,4 @@ scp -i $ssh_key $config_file $user@contiv-master:/tmp/
 
 # Extract and launch the installer
 ssh -i $ssh_key $user@contiv-master "cd /tmp && tar -xvzf $install_bundle && chmod +x contiv/ansible/install_k8s.sh"
-ssh -i $ssh_key $user@contiv-master "VAGRANT_USE_KUBEADM=1 CONTIV_NODE_OS=$contiv_os contiv/ansible/install_k8s.sh"
+ssh -i $ssh_key $user@contiv-master "CONTIV_KUBEADM=1 CONTIV_NODE_OS=$contiv_os contiv/ansible/install_k8s.sh"
diff --git a/scripts/kubeadm_test.sh b/scripts/kubeadm_test.sh
index 6ed4685..ee8692f 100644
--- a/scripts/kubeadm_test.sh
+++ b/scripts/kubeadm_test.sh
@@ -1,28 +1,77 @@
-ssh_key=${CONTIV_SSH_KEY:-"cluster/export/insecure_private_key"}
+#!/bin/bash
+
+set -euo pipefail
+
+# Get the master node IP from the yml file generated by vagrant
+contiv_master=$(grep -B 3 master cluster/.cfg.yml | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}" | xargs)
+
+# Default user is vagrant
 user=${CONTIV_SSH_USER:-"vagrant"}
-install_version=${CONTIV_RELEASE:-"contiv-devbuild"}
-contiv_os=${CONTIV_NODE_OS:-"centos7"}
-contiv_master=${CONTIV_MASTER:-"192.168.2.10"}
-dest_path=${CONTIV_TARGET:-"/home/vagrant"}
-ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-# Copy the installation folder
-scp $ssh_opts -i $ssh_key release/$install_version.tgz $user@$contiv_master:$dest_path
-
-# Extract and launch the installer
-ssh $ssh_opts -i $ssh_key $user@$contiv_master "sudo rm -rf $dest_path/$install_version"
-ssh $ssh_opts -i $ssh_key $user@$contiv_master "cd $dest_path && tar -xvzf $install_version.tgz"
-ssh $ssh_opts -i $ssh_key $user@$contiv_master "cd $dest_path/$install_version && chmod +x install/install.sh"
-ssh $ssh_opts -i $ssh_key $user@$contiv_master "cd $dest_path/$install_version && chmod +x install/k8s/install.sh"
-ssh $ssh_opts -i $ssh_key $user@$contiv_master "cd $dest_path/$install_version && sudo ./install/install.sh"
-ssh $ssh_opts -i $ssh_key $user@$contiv_master "cd $dest_path/$install_version && sudo ./install/k8s/install.sh -n $contiv_master"
-
-# Wait for CONTIV to start up
-sleep 60
-response=`curl -k -H "Content-Type: application/json" -X POST -d '{"username": "admin", "password": "admin"}' https://$contiv_master:10000/api/v1/auth_proxy/login`
-echo $response
-if  [[ $response == *"token"* ]]; then
-  echo "Install SUCCESS"
+
+# If BUILD_VERSION is not defined, we use a local dev build, that must have been created with make release
+install_version="contiv-${BUILD_VERSION:-devbuild}"
+default_net_cidr="${DEFAULT_NET:-20.1.1.0/24}"
+
+# For local builds, copy the build binaries to the vagrant node, using the vagrant ssh-key
+if [ "$install_version" = "contiv-devbuild" ];then
+  pushd cluster
+  ssh_key=$(CONTIV_KUBEADM=1 vagrant ssh-config contiv-node1 | grep IdentityFile | awk '{print $2}' | xargs)
+  popd
+  dest_path=${CONTIV_TARGET:-"/home/vagrant"}
+  ssh_opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+
+  # Copy the installation folder
+  scp $ssh_opts -i $ssh_key release/${install_version}.tgz $user@$contiv_master:$dest_path
+  curl_cmd="echo 'Devbuild'"
 else
-  echo "Install FAILED"
+  # github redirects you to a signed AWS URL, so we need to follow redirects with -L
+  curl_cmd="curl -L -O https://github.com/contiv/install/releases/download/${BUILD_VERSION}/${install_version}.tgz"
 fi
+
+# Extract the install bundle and launch the installer
+set +e # read returns 1 when it succeeds
+read -r -d '' COMMANDS <<-EOF
+    sudo rm -rf ${install_version} && \\
+    ${curl_cmd} && tar xf ${install_version}.tgz && \\
+    cd ${install_version} && \\
+    sudo ./install/k8s/install.sh -n ${contiv_master}
+EOF
+set -e
+
+cd cluster
+CONTIV_KUBEADM=1 vagrant ssh contiv-node1 -- "$COMMANDS"
+
+set +e
+read -r -d '' SETUP_DEFAULT_NET <<-EOF
+    cd ${install_version} && \\
+    sudo netctl net create -s ${default_net_cidr} default-net
+EOF
+set -e
+
+# Wait for CONTIV to start for up to 10 minutes
+sleep 10
+for i in {0..20}
+do
+  response=$(curl -k -H -s "Content-Type: application/json" -X POST -d '{"username": "admin", "password": "admin"}' https://$contiv_master:10000/api/v1/auth_proxy/login || true)
+  if [[ $response == *"token"* ]]; then
+    echo "Install SUCCESS"
+    echo ""
+    cat <<EOF
+  NOTE: Because the Contiv Admin Console is using a self-signed certificate for this demo,
+  you will see a security warning when the page loads.  You can safely dismiss it.
+  
+  You can access the Contiv master node with:
+    cd cluster && CONTIV_KUBEADM=1 vagrant ssh contiv-node1
+
+EOF
+    if [ "$install_version" != "contiv-devbuild" ];then
+      CONTIV_KUBEADM=1 vagrant ssh contiv-node1 -- "${SETUP_DEFAULT_NET}"
+    fi
+    exit 0
+  else
+    echo "$i. Retry login to Contiv"
+    sleep 30
+  fi
+done
+echo "Install FAILED"
+exit 1
diff --git a/scripts/release.sh b/scripts/release.sh
index 9e20192..776ffb5 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -102,7 +102,6 @@ sed -i.bak "s/__ACI_GW_VERSION__/$aci_gw_version/g" $ansible_env
 sed -i.bak "s/__API_PROXY_VERSION__/$auth_proxy_version/g" $ansible_env
 sed -i.bak "s/__ETCD_VERSION__/$etcd_version/g" $ansible_env
 
-chmod +x $output_dir/install/install.sh
 chmod +x $k8s_yaml_dir/install.sh
 chmod +x $k8s_yaml_dir/uninstall.sh
 sed -i.bak "s/__CONTIV_INSTALL_VERSION__/$VERSION/g" $ansible_yaml_dir/install_swarm.sh
@@ -120,14 +119,9 @@ ansible_spec=$output_dir/install/ansible/Dockerfile
 docker build -t contiv/install:$VERSION -f $ansible_spec $output_dir
 
 rm -rf $output_dir/scripts
-if [ "$DEV_IMAGE_NAME" = "$VERSION" ]; then
-  # This is a dev build, so save the images locally.
-  docker save contiv/install:$VERSION -o $output_dir/contiv-install-image.tar
-else
-  echo "**************************************************************************************************"
-  echo " Please ensure that contiv/install:$VERSION is pushed to docker hub"
-  echo "**************************************************************************************************"
-fi
+echo "**************************************************************************************************"
+echo " Please ensure that contiv/install:$VERSION is pushed to docker hub"
+echo "**************************************************************************************************"
 
 # Clean up the Dockerfiles, they are not part of the release bits.
 rm -f $ansible_spec
@@ -137,17 +131,20 @@ binary_cache=$output_dir/contiv_cache
 mkdir -p $binary_cache
 
 # Create the minimal tar bundle
-tar cvzf $tmp_output_file -C $release_dir .
+tar czf $tmp_output_file -C $release_dir .
 
 # Save the auth proxy & aci-gw images for packaging the full docker images with contiv install binaries
 if [ "$(docker images -q contiv/auth_proxy:$auth_proxy_version 2>/dev/null)" == "" ]; then
   docker pull contiv/auth_proxy:$auth_proxy_version
 fi
-docker save contiv/auth_proxy:$auth_proxy_version -o $binary_cache/auth-proxy-image.tar
+proxy_image=$(docker images -q contiv/auth_proxy:$auth_proxy_version)
+docker save $proxy_image -o $binary_cache/auth-proxy-image.tar
+
 if [ "$(docker images -q contiv/aci-gw:$aci_gw_version 2>/dev/null)" == "" ]; then
   docker pull contiv/aci-gw:$aci_gw_version
 fi
-docker save contiv/aci-gw:$aci_gw_version -o $binary_cache/aci-gw-image.tar
+aci_image=$(docker images -q contiv/aci-gw:$aci_gw_version)
+docker save $aci_image -o $binary_cache/aci-gw-image.tar
 
 curl -ksL -o $binary_cache/openvswitch-2.3.1-2.el7.x86_64.rpm  https://cisco.box.com/shared/static/zzmpe1zesdpf270k9pml40rlm4o8fs56.rpm
 curl -ksL -o $binary_cache/v1dvgoboo5zgqrtn6tu27vxeqtdo2bdl.deb https://cisco.box.com/shared/static/v1dvgoboo5zgqrtn6tu27vxeqtdo2bdl.deb
@@ -159,7 +156,7 @@ sed -i.bak "s#.*auth_proxy_local_install.*#  \"auth_proxy_local_install\": True,
 sed -i.bak "s#.*contiv_network_local_install.*#  \"contiv_network_local_install\": True#g" $env_file
 
 # Create the full tar bundle
-tar cvzf $tmp_full_output_file -C $release_dir .
+tar czf $tmp_full_output_file -C $release_dir .
 
 
 mv $tmp_output_file $output_file
diff --git a/scripts/swarm_test.sh b/scripts/swarm_test.sh
index 2cce187..11baa7c 100644
--- a/scripts/swarm_test.sh
+++ b/scripts/swarm_test.sh
@@ -1,18 +1,49 @@
-contiv_master=192.168.2.12
-install_version="contiv-${BUILD_VERSION:-devbuild}"
+#!/bin/bash
+
+set -euo pipefail
+
+# Get the master node IP from the yml file generated by vagrant
+contiv_master=$(grep -B 3 master cluster/.cfg.yml | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}" | xargs)
+
+# Default user is vagrant
+user=${CONTIV_SSH_USER:-"vagrant"}
 
+# If BUILD_VERSION is not defined, we use a local dev build, that must have been created with make release
+install_version="contiv-${BUILD_VERSION:-devbuild}"
+pushd cluster
+ssh_key=$(vagrant ssh-config contiv-node3 | grep IdentityFile | awk '{print $2}' | xargs)
+popd
 # Extract and launch the installer
-cd release && tar -xvzf $install_version.tgz
+cd release
+if [ "$install_version" != "contiv-devbuild" ];then
+  # For release builds, get the build from github releases
+  curl -L -O https://github.com/contiv/install/releases/download/${BUILD_VERSION}/${install_version}.tgz
+fi
+
+tar xf $install_version.tgz
 cd $install_version
-docker load -i contiv-install-image.tar
-./install/ansible/install_swarm.sh -f install/ansible/cfg.yml -e ../../cluster/export/insecure_private_key -u vagrant -i
+./install/ansible/install_swarm.sh -f ../../cluster/.cfg.yml -e $ssh_key -u vagrant -i
 
-# Wait for CONTIV to start up
-sleep 60
-response=`curl -k -H "Content-Type: application/json" -X POST -d '{"username": "admin", "password": "admin"}' https://$contiv_master:10000/api/v1/auth_proxy/login`
-echo $response
-if  [[ $response == *"token"* ]]; then
-  echo "Install SUCCESS"
-else
-  echo "Install FAILED"
-fi
+# Wait for CONTIV to start for up to 10 minutes
+sleep 10
+for i in {0..20}
+do
+  response=$(curl -k -H -s "Content-Type: application/json" -X POST -d '{"username": "admin", "password": "admin"}' https://$contiv_master:10000/api/v1/auth_proxy/login || true)
+  if [[ $response == *"token"* ]]; then
+    echo "Install SUCCESS"
+    echo ""
+    cat <<EOF
+  NOTE: Because the Contiv Admin Console is using a self-signed certificate for this demo,
+  you will see a security warning when the page loads.  You can safely dismiss it.
+  
+  You can access the Contiv master node with:
+    cd cluster && vagrant ssh contiv-node3
+EOF
+    exit 0
+  else
+    echo "$i. Retry login to Contiv"
+    sleep 30
+  fi
+done
+echo "Install FAILED"
+exit 1
\ No newline at end of file