diff --git a/kubernetes.tf b/kubernetes.tf
index c253da0..5c44a68 100644
--- a/kubernetes.tf
+++ b/kubernetes.tf
@@ -46,14 +46,19 @@ module "bootkube-start" {
   asset-dir = "${path.root}/k8s"
 
   assets = {
+    kubeconfig         = "${module.bootkube.kubeconfig-kubelet}"
+    ca_cert            = "${base64decode(module.bootkube.ca_cert)}"
+    kubelet_cert       = "${base64decode(module.bootkube.kubelet_cert)}"
+    kubelet_key        = "${base64decode(module.bootkube.kubelet_key)}"
     kubeconfig-kubelet = "${module.bootkube.kubeconfig-kubelet}"
-    etcd_ca_cert       = "${module.bootkube.etcd_ca_cert}"
-    etcd_client_cert   = "${module.bootkube.etcd_client_cert}"
-    etcd_client_key    = "${module.bootkube.etcd_client_key}"
-    etcd_server_cert   = "${module.bootkube.etcd_server_cert}"
-    etcd_server_key    = "${module.bootkube.etcd_server_key}"
-    etcd_peer_cert     = "${module.bootkube.etcd_peer_cert}"
-    etcd_peer_key      = "${module.bootkube.etcd_peer_key}"
+
+    # etcd_ca_cert       = "${module.bootkube.etcd_ca_cert}"
+    # etcd_client_cert   = "${module.bootkube.etcd_client_cert}"
+    # etcd_client_key    = "${module.bootkube.etcd_client_key}"
+    # etcd_server_cert   = "${module.bootkube.etcd_server_cert}"
+    # etcd_server_key    = "${module.bootkube.etcd_server_key}"
+    # etcd_peer_cert     = "${module.bootkube.etcd_peer_cert}"
+    # etcd_peer_key      = "${module.bootkube.etcd_peer_key}"
   }
 
   providers = {
diff --git a/modules/bootkube/main.tf b/modules/bootkube/main.tf
index 6c0d6b8..4e8896a 100644
--- a/modules/bootkube/main.tf
+++ b/modules/bootkube/main.tf
@@ -10,16 +10,16 @@ resource "docker_container" "bootkube" {
   # bootstrap manifests
 
   upload {
-    content = "${file("${var.asset-dir}/bootstra-manifests/bootstrap-apiserver.yaml")}"
-    file    = "/home/.bootkube/bootstra-manifests/bootstrap-apiserver.yaml"
+    content = "${file("${var.asset-dir}/bootstrap-manifests/bootstrap-apiserver.yaml")}"
+    file    = "/home/.bootkube/bootstrap-manifests/bootstrap-apiserver.yaml"
   }
   upload {
-    content = "${file("${var.asset-dir}/bootstra-manifests/bootstrap-controller-manager.yaml")}"
-    file    = "/home/.bootkube/bootstra-manifests/bootstrap-controller-manager.yaml"
+    content = "${file("${var.asset-dir}/bootstrap-manifests/bootstrap-controller-manager.yaml")}"
+    file    = "/home/.bootkube/bootstrap-manifests/bootstrap-controller-manager.yaml"
   }
   upload {
-    content = "${file("${var.asset-dir}/bootstra-manifests/bootstrap-scheduler.yaml")}"
-    file    = "/home/.bootkube/bootstra-manifests/bootstrap-scheduler.yaml"
+    content = "${file("${var.asset-dir}/bootstrap-manifests/bootstrap-scheduler.yaml")}"
+    file    = "/home/.bootkube/bootstrap-manifests/bootstrap-scheduler.yaml"
   }
   # Cluster Networking
   upload {
@@ -39,7 +39,7 @@ resource "docker_container" "bootkube" {
     file    = "/home/.bootkube/manifests-networking/daemonset.yaml"
   }
   upload {
-    content = "${file("${var.asset-dir}/manifests-networkingservice-account.yaml")}"
+    content = "${file("${var.asset-dir}/manifests-networking/service-account.yaml")}"
     file    = "/home/.bootkube/manifests-networking/service-account.yaml"
   }
   # TLS
@@ -82,6 +82,12 @@ resource "docker_container" "bootkube" {
     content = "${var.assets["kubeconfig-kubelet"]}"
     file    = "/home/.bootkube/auth/kubeconfig-kubelet"
   }
+  # TODO: Move to a module read instead of file
+  # auth/kubeconfig
+  upload {
+    file    = "/home/.bootkube/auth/kubeconfig"
+    content = "${file("${var.asset-dir}/auth/kubeconfig")}"
+  }
   # Manifests Directory
   upload {
     file    = "/home/.bootkube/manifests/kube-apiserver-role-binding.yaml"