diff --git a/voltha b/voltha
index d0143e1..8bcc2cf 100755
--- a/voltha
+++ b/voltha
@@ -226,12 +226,35 @@
 mkdir -p $GOPATH/bin
 espin $VERIFIED
 
+bspin "Verify kubectl"
+if [ -x $GOPATH/bin/kubectl ]; then
+    espin $VERIFIED
+else
+    espin $NOT_VERIFIED
+    bspin - "Download and install Kubernetes/kubectl"
+    (set -x; curl -o $GOPATH/bin/kubectl -sSL https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/$(go env GOHOSTOS)/$(go env GOARCH)/kubectl >>$LOG 2>&1) >>$LOG 2>&1
+    (set -x; chmod 755 $GOPATH/bin/kubectl >>$LOG 2>&1) >>$LOG 2>&1
+    espin - $VERIFIED
+fi
+
+# Unclear if kubeadm is required. Leave out for now
+#bspin "Verify Kubernetes/kubectl"
+#if [ -x $GOPATH/bin/kubeadm ]; then
+#    espin $VERIFIED
+#else
+#    espin $NOT_VERIFIED
+#    bspin - "Download and install Kubernetes/kubectl"
+#    (set -x; curl -o $GOPATH/bin/kubeadm -sSL https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/$(go env GOHOSTOS)/$(go env GOARCH)/kubeadm >>$LOG 2>&1) >>$LOG 2>&1
+#    (set -x; chmod 755 $GOPATH/bin/kubeadm >>$LOG 2>&1) >>$LOG 2>&1
+#    espin - $VERIFIED
+#fi
+
 bspin "Verify Kubernetes/Kind"
 if [ -x $GOPATH/bin/kind ]; then
     espin $VERIFIED
 else
     espin $NOT_VERIFIED
-    bspin - "Download and build Kubernetes/Kind"
+    bspin - "Download and install Kubernetes/kind"
     (set -x; curl -o $GOPATH/bin/kind -sSL https://github.com/kubernetes-sigs/kind/releases/download/$KIND_VERSION/kind-$(go env GOHOSTOS)-$(go env GOARCH) >>$LOG 2>&1) >>$LOG 2>&1
     (set -x; chmod 755 $GOPATH/bin/kind >>$LOG 2>&1) >>$LOG 2>&1
     espin - $VERIFIED