diff --git a/.gitignore b/.gitignore
index 2f054d25..7c845970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Binary output dir
 bin/
+e2e/bin/
 
 # GOPATH created by the build script
 gopath/
diff --git a/e2e/README.md b/e2e/README.md
index f6ee410d..a9897c3f 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -10,3 +10,9 @@ $ ./get_tools.sh
 $ ./setup_cluster.sh
 $ ./test-simple-macvlan1.sh
 ```
+
+### How to teardown cluster
+
+```
+$ ./teardown.sh
+```
diff --git a/e2e/get_tools.sh b/e2e/get_tools.sh
index 32f4e48d..2745315a 100755
--- a/e2e/get_tools.sh
+++ b/e2e/get_tools.sh
@@ -5,7 +5,7 @@ if [ ! -d bin ]; then
 	mkdir bin
 fi
 
-curl -Lo ./bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-$(uname)-amd64"
+curl -Lo ./bin/kind "https://github.com/kubernetes-sigs/kind/releases/download/v0.8.1/kind-$(uname)-amd64"
 chmod +x ./bin/kind
 curl -Lo ./bin/kubectl https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
 chmod +x ./bin/kubectl
diff --git a/e2e/setup_cluster.sh b/e2e/setup_cluster.sh
index 152b3870..7a6bb122 100755
--- a/e2e/setup_cluster.sh
+++ b/e2e/setup_cluster.sh
@@ -3,32 +3,64 @@ set -o errexit
 
 export PATH=${PATH}:./bin
 
+kind_network='kind'
 reg_name='kind-registry'
 reg_port='5000'
 running="$(docker inspect -f '{{.State.Running}}' "${reg_name}" 2>/dev/null || true)"
 if [ "${running}" != 'true' ]; then
+  # run registry and push the multus image
   docker run -d --restart=always -p "${reg_port}:5000" --name "${reg_name}" registry:2
+  docker build -t localhost:5000/multus:e2e ..
+  docker push localhost:5000/multus:e2e
 fi
-reg_ip="$(docker inspect -f '{{.NetworkSettings.IPAddress}}' "${reg_name}")"
+reg_host="${reg_name}"
+if [ "${kind_network}" = "bridge" ]; then
+    reg_host="$(docker inspect -f '{{.NetworkSettings.IPAddress}}' "${reg_name}")"
+fi
+echo "Registry Host: ${reg_host}"
 
+# deploy cluster with kind
 cat <<EOF | kind create cluster --config=-
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 containerdConfigPatches:
 - |-
   [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:${reg_port}"]
-    endpoint = ["http://${reg_ip}:${reg_port}"]
+    endpoint = ["http://${reg_host}:${reg_port}"]
 nodes:
   - role: control-plane
   - role: worker
   - role: worker
 EOF
 
+cat <<EOF | kubectl apply -f -
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: local-registry-hosting
+  namespace: kube-public
+data:
+  localRegistryHosting.v1: |
+    host: "localhost:${reg_port}"
+    help: "https://kind.sigs.k8s.io/docs/user/local-registry/"
+EOF
+
+containers=$(docker network inspect ${kind_network} -f "{{range .Containers}}{{.Name}} {{end}}")
+needs_connect="true"
+for c in $containers; do
+  if [ "$c" = "${reg_name}" ]; then
+    needs_connect="false"
+  fi
+done
+if [ "${needs_connect}" = "true" ]; then
+  docker network connect "${kind_network}" "${reg_name}" || true
+fi
+
 kind export kubeconfig
 sudo env PATH=${PATH} koko -d kind-worker,eth1 -d kind-worker2,eth1
 sleep 1
 kubectl -n kube-system wait --for=condition=available deploy/coredns --timeout=300s
-kubectl create -f https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset.yml
+kubectl create -f multus-daemonset.yml
 sleep 1
 kubectl -n kube-system wait --for=condition=ready -l name=multus pod --timeout=300s
 kubectl create -f cni-install.yml
diff --git a/e2e/setup_multus.sh b/e2e/setup_multus.sh
deleted file mode 100755
index 95d95ab3..00000000
--- a/e2e/setup_multus.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-set -o errexit
-
-export PATH=${PATH}:./bin
-
-kind export kubeconfig
-sudo koko -d kind-worker,eth1 -d kind-worker2,eth1
-sleep 1
-kubectl -n kube-system wait --for=condition=available deploy/coredns --timeout=300s
-kubectl create -f https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset.yml
-sleep 1
-kubectl -n kube-system wait --for=condition=ready -l name=multus pod --timeout=300s
-kubectl create -f cni-install.yml
-sleep 1
-kubectl -n kube-system wait --for=condition=ready -l name=cni-plugins pod --timeout=300s
diff --git a/e2e/teardown.sh b/e2e/teardown.sh
new file mode 100755
index 00000000..a9f6d12f
--- /dev/null
+++ b/e2e/teardown.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#set -o errexit
+
+reg_name='kind-registry'
+export PATH=${PATH}:./bin
+
+# delete cluster kind
+kind delete cluster
+docker kill ${reg_name}
+docker rm ${reg_name}
diff --git a/e2e/test-simple-macvlan1.sh b/e2e/test-simple-macvlan1.sh
index 2ab8b9bf..5bd281e7 100755
--- a/e2e/test-simple-macvlan1.sh
+++ b/e2e/test-simple-macvlan1.sh
@@ -7,7 +7,7 @@ kubectl create -f macvlan1.yml
 kubectl wait --for=condition=ready -l app=macvlan --timeout=300s pod
 
 echo "check macvlan1-worker1 interface: net1"
-kubectl exec macvlan1-worker1 ip a show dev net1
+kubectl exec macvlan1-worker1 -- ip a show dev net1
 
 echo "check macvlan1-worker1 interface address: net1"
 ipaddr=$(kubectl exec macvlan1-worker1 -- ip -j a show  | jq -r \
@@ -17,7 +17,7 @@ if [ $ipaddr != "10.1.1.11" ]; then
 fi
 
 echo "check macvlan1-worker2 interface: net1"
-kubectl exec macvlan1-worker2 ip a show dev net1
+kubectl exec macvlan1-worker2 -- ip a show dev net1
 
 echo "check macvlan1-worker2 interface address: net1"
 ipaddr=$(kubectl exec macvlan1-worker2 -- ip -j a show  | jq -r \