diff --git a/.gitignore b/.gitignore
index 23ca2d449f96..5abdb95bfc1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,8 @@ tags
 hack/gen-swagger-doc/*.adoc
 hack/gen-swagger-doc/*.md
 hack/gen-swagger-doc/html5
+cluster/local/certs
+**.swp
+**.pem
+**.crt
+**.csr
diff --git a/Makefile b/Makefile
index b60eed4e8711..c3aff6df3d27 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,6 @@ checksync:
 sync:
 	glide install --strip-vendor
 	${HASH} glide.lock > .glide.lock.hash
- 
 
 docker: build
 	./hack/build-docker.sh build ${WHAT}
@@ -83,18 +82,6 @@ check: check-bash vet
 check-bash:
 	find . -name \*.sh -exec bash -n \{\} \;
 
-vagrant-sync-config:
-	./cluster/vagrant/sync_config.sh
-
-vagrant-sync-build: build
-	./cluster/vagrant/sync_build.sh
-
-vagrant-sync-optional:
-	./cluster/vagrant/sync_build.sh 'build optional'
-
-vagrant-deploy: vagrant-sync-config vagrant-sync-build
-	export KUBECTL="cluster/kubectl.sh" && ./cluster/deploy.sh
-
 .release-functest:
 	make functest > .release-functest 2>&1
 
diff --git a/cluster/deploy.sh b/cluster/deploy.sh
index a852501d7700..4c932a0db946 100755
--- a/cluster/deploy.sh
+++ b/cluster/deploy.sh
@@ -19,21 +19,22 @@
 
 set -ex
 
-KUBECTL=${KUBECTL:-kubectl}
+PROVIDER=${PROVIDER:-vagrant}
 
+source cluster/$PROVIDER/provider.sh
 source hack/config.sh
 
 echo "Cleaning up ..."
 # Work around https://github.com/kubernetes/kubernetes/issues/33517
-$KUBECTL delete ds -l "kubevirt.io" -n kube-system --cascade=false --grace-period 0 2>/dev/null || :
-$KUBECTL delete pods -n kube-system -l="kubevirt.io=libvirt" --force --grace-period 0 2>/dev/null || :
-$KUBECTL delete pods -n kube-system -l="kubevirt.io=virt-handler" --force --grace-period 0 2>/dev/null || :
+_kubectl delete ds -l "kubevirt.io" -n kube-system --cascade=false --grace-period 0 2>/dev/null || :
+_kubectl delete pods -n kube-system -l="kubevirt.io=libvirt" --force --grace-period 0 2>/dev/null || :
+_kubectl delete pods -n kube-system -l="kubevirt.io=virt-handler" --force --grace-period 0 2>/dev/null || :
 
 # Delete everything, no matter if release, devel or infra
-$KUBECTL delete -f manifests -R --grace-period 1 2>/dev/null || :
+_kubectl delete -f manifests -R --grace-period 1 2>/dev/null || :
 
 # Delete exposures
-$KUBECTL delete services -l "kubevirt.io" -n kube-system
+_kubectl delete services -l "kubevirt.io" -n kube-system
 
 sleep 2
 
@@ -41,12 +42,16 @@ echo "Deploying ..."
 
 # Deploy the right manifests for the right target
 if [ -z "$TARGET" ] || [ "$TARGET" = "vagrant-dev"  ]; then
-    $KUBECTL create -f manifests/dev -R $i
+    _kubectl create -f manifests/dev -R $i
 elif [ "$TARGET" = "vagrant-release"  ]; then
-    $KUBECTL create -f manifests/release -R $i
+    _kubectl create -f manifests/release -R $i
 fi
 
+## Expose common services
+$KUBECTL expose deployment haproxy --port 8184 -l 'kubevirt.io=haproxy' -n kube-system --external-ip $master_ip
+$KUBECTL expose deployment spice-proxy --port 3128 -l 'kubevirt.io=spice-proxy' -n kube-system --external-ip $master_ip
+
 # Deploy additional infra for testing
-$KUBECTL create -f manifests/testing -R $i
+_kubectl create -f manifests/testing -R $i
 
 echo "Done"
diff --git a/cluster/down.sh b/cluster/down.sh
new file mode 100755
index 000000000000..37999b26ad54
--- /dev/null
+++ b/cluster/down.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+PROVIDER=${PROVIDER:-vagrant}
+source cluster/$PROVIDER/provider.sh
+down
diff --git a/cluster/kubectl.sh b/cluster/kubectl.sh
index 9d2fb10d53a7..a8f466e5d070 100755
--- a/cluster/kubectl.sh
+++ b/cluster/kubectl.sh
@@ -17,13 +17,12 @@
 # Copyright 2017 Red Hat, Inc.
 #
 
+PROVIDER=${PROVIDER:-vagrant}
+source cluster/$PROVIDER/provider.sh
 source ${KUBEVIRT_PATH}hack/config.sh
 
-SYNC_CONFIG=${KUBEVIRT_PATH}cluster/vagrant/sync_config.sh
-
-if [ "$1" == "--init" ]
-then
-    exec $SYNC_CONFIG
+if [ "$1" == "console" ] || [ "$1" == "spice" ]; then
+    cmd/virtctl/virtctl "$@" -s http://${master_ip}:8184 
     exit
 fi
 
@@ -33,8 +32,12 @@ if [ "$1" == "--help" ]  || [ "$1" == "-h" ] ; then
 fi
 
 if [ -e  ${KUBEVIRT_PATH}cluster/vagrant/.kubeconfig ] &&
-   [ -e ${KUBEVIRT_PATH}cluster/vagrant/.kubectl ]; then
-    ${KUBEVIRT_PATH}cluster/vagrant/.kubectl --kubeconfig=${KUBEVIRT_PATH}cluster/vagrant/.kubeconfig "$@"
+   [ -e ${KUBEVIRT_PATH}cluster/vagrant/.kubectl ] &&
+   [ "x$1" == "x--core" ]; then
+    shift
+    _kubectl "$@"
+elif [ -e ${KUBEVIRT_PATH}cluster/vagrant/.kubectl ];then
+    _kubectl -s http://${master_ip}:8184 "$@"
 else
-    echo "Did you already run '$SYNC_CONFIG' to deploy kubevirt?"
+    echo "Did you already run 'cluster/up.sh' to deploy kubevirt?"
 fi
diff --git a/cluster/local/provider.sh b/cluster/local/provider.sh
new file mode 100644
index 000000000000..6ddf7618c506
--- /dev/null
+++ b/cluster/local/provider.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+function _cert_dir () {
+  echo $GOPATH/src/kubevirt.io/kubevirt/cluster/local/certs
+}
+
+function _main_ip {
+  ip -o -4 a | tr -s ' ' | cut -d' ' -f 2,4\
+          | grep -v -e '^lo[0-9:]*' | head -1\
+          | cut -d' ' -f 2 | cut -d'/' -f1
+}
+
+function up () {
+  go get -d k8s.io/kubernetes
+
+  export API_HOST_IP=$(_main_ip)
+  export KUBELET_HOST=$(_main_ip)
+  export HOSTNAME_OVERRIDE=kubdev
+  export ALLOW_PRIVILEGED=1
+  export ALLOW_SECURITY_CONTEXT=1
+  export KUBE_DNS_DOMAIN="cluster.local"
+  export KUBE_DNS_SERVER_IP="10.0.0.10"
+  export KUBE_ENABLE_CLUSTER_DNS=true
+  export CERT_DIR=$(_cert_dir)
+  (
+    cd $GOPATH/src/k8s.io/kubernetes        
+    ./hack/local-up-cluster.sh
+  )
+}
+
+function prepare_config () {
+  cat > hack/config-local.sh <<EOF
+master_ip=$(_main_ip)
+docker_tag=devel
+EOF
+}
+
+function build () {
+  make manifests docker
+}
+
+function _kubectl () {
+  export KUBECONFIG=$(_cert_dir)/admin.kubeconfig
+  $GOPATH/src/k8s.io/kubernetes/cluster/kubectl.sh "$@"
+}
+
+function down () {
+  true
+}
+
+# Make sure that local config is correct
+prepare_config
diff --git a/cluster/sync.sh b/cluster/sync.sh
index 30c4bc0eea67..763de6642163 100755
--- a/cluster/sync.sh
+++ b/cluster/sync.sh
@@ -20,4 +20,9 @@
 # This logic moved into the Makefile.
 # We're leaving this file around for people who still reference this
 # specific script in their development workflow.
-make vagrant-deploy
+
+PROVIDER=${PROVIDER:-vagrant}
+source cluster/$PROVIDER/provider.sh
+
+build
+cluster/deploy.sh
diff --git a/cluster/up.sh b/cluster/up.sh
new file mode 100755
index 000000000000..f9b901dd7d1e
--- /dev/null
+++ b/cluster/up.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+PROVIDER=${PROVIDER:-vagrant}
+source cluster/$PROVIDER/provider.sh
+up
diff --git a/cluster/vagrant/provider.sh b/cluster/vagrant/provider.sh
new file mode 100644
index 000000000000..feb32217b512
--- /dev/null
+++ b/cluster/vagrant/provider.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+function _main_ip {
+  echo 192.168.200.2
+}
+
+function up () {
+  # Make sure that the vagrant environment is up and running
+  vagrant up --provider=libvirt
+  # Synchronize kubectl config
+  vagrant ssh-config master 2>&1 | grep "not yet ready for SSH" >/dev/null \
+        && { echo "Master node is not up"; exit 1; }
+
+  OPTIONS=`vagrant ssh-config master | grep -v '^Host ' | awk -v ORS=' ' 'NF{print "-o " $1 "=" $2}'`
+
+  scp $OPTIONS master:/usr/bin/kubectl ${KUBEVIRT_PATH}cluster/vagrant/.kubectl
+  chmod u+x cluster/vagrant/.kubectl
+
+  vagrant ssh master -c "sudo cat /etc/kubernetes/admin.conf" > ${KUBEVIRT_PATH}cluster/vagrant/.kubeconfig
+}
+
+function prepare_config () {
+  cat > hack/config-local.sh <<EOF
+master_ip=$(_main_ip)
+docker_tag=devel
+EOF
+}
+
+function build () {
+  make build manifests
+  for VM in `vagrant status | grep -v "^The Libvirt domain is running." | grep running | cut -d " " -f1`; do
+    vagrant rsync $VM # if you do not use NFS
+    vagrant ssh $VM -c "cd /vagrant && export DOCKER_TAG=devel && sudo -E hack/build-docker.sh build optional"
+  done
+}
+
+function _kubectl () {
+  export KUBECONFIG=${KUBEVIRT_PATH}cluster/vagrant/.kubeconfig
+  ${KUBEVIRT_PATH}cluster/vagrant/.kubectl "$@"
+}
+
+function down () {
+  vagrant halt
+}
+
+# Make sure that local config is correct
+prepare_config
diff --git a/cluster/vagrant/sync_build.sh b/cluster/vagrant/sync_build.sh
deleted file mode 100755
index b325ad9aa0a9..000000000000
--- a/cluster/vagrant/sync_build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# This file is part of the KubeVirt project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Copyright 2017 Red Hat, Inc.
-#
-set -ex
-
-make all DOCKER_TAG=devel
-
-for VM in `vagrant status | grep -v "^The Libvirt domain is running." | grep running | cut -d " " -f1`; do
-  vagrant rsync $VM # if you do not use NFS
-  vagrant ssh $VM -c "cd /vagrant && export DOCKER_TAG=devel && sudo -E hack/build-docker.sh $@"
-done
-
diff --git a/cluster/vagrant/sync_config.sh b/cluster/vagrant/sync_config.sh
deleted file mode 100755
index 72e28d62c909..000000000000
--- a/cluster/vagrant/sync_config.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-#
-# This file is part of the KubeVirt project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Copyright 2017 Red Hat, Inc.
-#
-
-set -ex
-
-vagrant ssh-config master 2>&1 | grep "not yet ready for SSH" >/dev/null \
-        && { echo "Master node is not up"; exit 1; }
-
-OPTIONS=`vagrant ssh-config master | grep -v '^Host ' | awk -v ORS=' ' 'NF{print "-o " $1 "=" $2}'`
-
-scp $OPTIONS master:/usr/bin/kubectl ${KUBEVIRT_PATH}cluster/vagrant/.kubectl
-chmod u+x cluster/vagrant/.kubectl
-
-vagrant ssh master -c "sudo cat /etc/kubernetes/admin.conf" > ${KUBEVIRT_PATH}cluster/vagrant/.kubeconfig
diff --git a/docs/dev-env-local.md b/docs/dev-env-local.md
deleted file mode 100644
index 8da89652788c..000000000000
--- a/docs/dev-env-local.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Local development environment
-
-This document explains how to setup a local development environment
-for kubernetes and kubevirt. In this setup everything runs in the
-OS you are developing on, in constrast to the Vagrant environment
-which spins up a separate virtual machine. This local env is useful
-if you are already developing from inside a virtual machine, in
-which case Vagrant would be forced to use a QEMU emulated env with
-no KVM acceleration.
-
-## Getting the source
-
-```bash
-mkdir -p $HOME/src/k8s/{src,bin,pkg}
-echo "export GOPATH=$HOME/src/k8s" >> ~/.bashrc
-echo "export PATH=\$GOPATH/bin:\$GOPATH/src/k8s.io/kubernetes/_output/bin:\$PATH" >> ~/.bashrc
-source ~/.bashrc
-```
-
-If you have a working Go environment, run
-
-```bash
-go get -d k8s.io/kubernetes
-cd $GOPATH/src/k8s.io/kubernetes
-```
-
-to fetch the latest kubernetes sources.
-
-## Running kubernetes
-
-The first step is to get kubernetes itself up & running on the local
-machine. This setup provides just a single compute node running
-locally.
-
-Assuming a machine with a hostname of `kubdev` and IP address
-of `192.168.122.13`, then from the root of a k8s checkout
-
-```bash
-export API_HOST_IP=192.168.122.13
-export KUBELET_HOST=192.168.122.13
-export HOSTNAME_OVERRIDE=kubdev
-export ALLOW_PRIVILEGED=1
-export ALLOW_SECURITY_CONTEXT=1
-export KUBE_DNS_DOMAIN="cluster.local"
-export KUBE_DNS_SERVER_IP="10.0.0.10"
-export KUBE_ENABLE_CLUSTER_DNS=true
-./hack/local-up-cluster.sh
-```
-
-Once k8s has been launched once, you can skip the slow compilation
-step using
-
-```bash
-./hack/local-up-cluster.sh -o _output/local/bin/linux/amd64/
-```
-
-
-## Building kubevirt
-
-First configure kubevirt with site specific parameters. As above
-we need the IP address of the host.
-
-```bash
-cat > hack/config-local.sh <<EOF
-master_ip=192.168.122.13
-docker_tag=latest
-EOF
-make manifests docker
-```
-
-## Running kubevirt
-
-Simply load all the manifests into k8s, and then wait for all
-pods to change to running state:
-
-```bash
-for i in manifests/*.yaml
-   do
-     kubectl create -f $i
-   done
-kubectl get pods
-```
-
-
-## Launching a VM
-
-```bash
-kubectl create -f cluster/vm.yaml
-```
-
-## Running functional tests
-
-```bash
-make functest
-```
diff --git a/docs/env-providers.md b/docs/env-providers.md
new file mode 100644
index 000000000000..e97758d9b290
--- /dev/null
+++ b/docs/env-providers.md
@@ -0,0 +1,51 @@
+# Development and Testing Environment Providers
+
+All following providers allow a common workflow:
+
+ * `cluster/up.sh` to create the environment
+ * `cluster/down.sh` to stop the environment
+ * `cluster/sync.sh` to build the code and deploy it
+ * `make functests` to run the functional tests against a KubeVirt
+ * `cluster/kubectl.sh` to talk to the k8s installation
+
+It is recommended to export the `PROVIDER` vagirable as part of your .bashrc.
+
+## Vagrant
+
+Allows provisioning k8s cluster based on kubeadm. Supports an arbitrary amount
+of nodes.
+
+Requires:
+ * A working go installation
+ * Vagrant installation with libvirt provider
+ * Nested virtualization enabled
+
+Usage:
+
+```bash
+export PROVIDER=vagrant # choose this provider
+export VAGRANT_NUM_NODES=2 # master + two nodes
+cluser/up.sh
+```
+
+## Local
+
+Allows provisioning a single-master k8s cluster based on latest upstream k8s
+code.
+
+Requires:
+ * A working go installation
+ * A running docker daemon
+
+Usage:
+
+```bash
+export PROVIDER=local # choose this provider
+cluser/up.sh
+```
+
+## New Providers
+
+ * Create a `cluster/$POVIDER` directory
+ * Create a `cluster/$PROVIDER/provider.sh` files
+ * This file should containe the functions `up`, `build`, `down` and `_kubectl`
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 06fc02ea4c10..e422233f55a9 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -91,8 +91,8 @@ Vagrant environment:
 
 ```bash
     # Building and deploying kubevirt in Vagrant
-    vagrant up
-    make vagrant-deploy
+    cluster/up.sh
+    cluster/deploy.sh
 ```
 
 This will create a VM called `master` which acts as Kubernetes master and then
@@ -162,7 +162,7 @@ They don't require vagrant. To run the *functional tests*, make sure you have se
 up [Vagrant](#vagrant). Then run
 
 ```bash
-    make vagrant-deploy # synchronize with your code, if necessary
+    cluster/sync.sh # synchronize with your code, if necessary
     make functest # run the functional tests against the Vagrant VMs
 ```