diff --git a/modules/bootkube/main.tf b/modules/bootkube/main.tf
index 403796f..bd4a860 100644
--- a/modules/bootkube/main.tf
+++ b/modules/bootkube/main.tf
@@ -11,7 +11,7 @@ resource "docker_container" "render" {
   command = [
     "bootkube",
     "render",
-    "--etcd-servers=http://${var.host_ip}:2379",
+    "--etcd-servers=https://${var.host_ip}:2379",
     "--asset-dir=/home/.bootkube",
     "--api-servers=https://kubernetes.default:${var.host_port},https://${var.k8s_host}:${var.host_port},https://${var.host_ip}:${var.host_port}",
     "--pod-cidr=${var.pod_cidr}",
@@ -53,7 +53,7 @@ resource "docker_container" "start" {
 }
 
 data "docker_registry_image" "image" {
-  name = "captn3m0/bootkube:v${var.version}"
+  name = "quay.io/coreos/bootkube:v${var.version}"
 }
 
 resource "docker_image" "image" {
diff --git a/modules/kubelet/main.tf b/modules/kubelet/main.tf
index 76d918c..130b0b8 100644
--- a/modules/kubelet/main.tf
+++ b/modules/kubelet/main.tf
@@ -83,9 +83,11 @@ resource "docker_container" "kubelet" {
     "kubelet",
     "--allow-privileged",
     "--anonymous-auth=false",
+    "--authentication-token-webhook",
+    "--authorization-mode=Webhook",
     "--cert-dir=/var/lib/kubelet/pki",
     "--client-ca-file=/etc/kubernetes/ca.crt",
-    "--cni-conf-dir=/etc/kubernetes/cni/net.d",
+    "--cluster_dns=${var.dns_ip}",
     "--exit-on-lock-contention=true",
     "--hostname-override=${var.host_ip}",
     "--kubeconfig=/etc/kubernetes/kubeconfig",
@@ -94,11 +96,8 @@ resource "docker_container" "kubelet" {
     "--network-plugin=cni",
     "--node-labels=node-role.kubernetes.io/master",
     "--pod-manifest-path=/etc/kubernetes/manifests",
+    "--read-only-port=0",
     "--rotate-certificates",
-
-    // TODO: Change to var
-    "--cluster_dns=10.25.0.10",
-
     "--cluster_domain=${var.k8s_host}",
   ]
   host {
diff --git a/modules/kubelet/variables.tf b/modules/kubelet/variables.tf
index ca3025d..d68cf21 100644
--- a/modules/kubelet/variables.tf
+++ b/modules/kubelet/variables.tf
@@ -20,6 +20,10 @@ variable "asset_dir_volume_name" {
 
 variable "host_ip" {}
 
+variable "dns_ip" {
+  default = "10.25.0.10"
+}
+
 variable "k8s_host" {
   description = "kubenetes hostname"
 }