diff --git a/kubernetes/files/kubelet/default.master b/kubernetes/files/kubelet/default.master
index b53c35c..9fb3840 100644
--- a/kubernetes/files/kubelet/default.master
+++ b/kubernetes/files/kubelet/default.master
@@ -1,4 +1,4 @@
 {%- from "kubernetes/map.jinja" import master with context %}
 
 # test_args has to be kept at the end, so they'll overwrite any prior configuration
-DAEMON_ARGS="--config=/etc/kubernetes/manifests --allow-privileged={{ master.kubelet.allow_privileged }} --cluster_dns={{ master.addons.dns.server }} --register-node=false --cluster_domain={{ master.addons.dns.domain }} --v=2"
\ No newline at end of file
+DAEMON_ARGS="--config=/etc/kubernetes/manifests --allow-privileged={{ master.kubelet.allow_privileged }} --cluster_dns={{ master.addons.dns.server }} --register-node=false --cluster_domain={{ master.addons.dns.domain }} --v=2"
diff --git a/kubernetes/files/kubelet/default.pool b/kubernetes/files/kubelet/default.pool
index 52bf112..a67b73c 100644
--- a/kubernetes/files/kubelet/default.pool
+++ b/kubernetes/files/kubelet/default.pool
@@ -1,4 +1,4 @@
 {%- from "kubernetes/map.jinja" import pool with context %}
 
 # test_args has to be kept at the end, so they'll overwrite any prior configuration
-DAEMON_ARGS="--api-servers={% for member in pool.apiserver.members %}{%- if pool.apiserver.insecure.enabled %}http://{{ member.host }}:8080{%- else %}https://{{ member.host }}{%- endif %}{% if not loop.last %},{% endif %}{% endfor %} --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --config=/etc/kubernetes/manifests --allow-privileged={{ pool.kubelet.allow_privileged }} --cluster_dns={{ pool.cluster_dns }} --cluster_domain={{ pool.cluster_domain }} --v=2 {% if pool.network.engine == 'opencontrail' %}--network-plugin={{ pool.network.engine }}{% endif %} {% if pool.network.engine == 'calico' %}--network-plugin=cni --network-plugin-dir=/etc/cni/net.d{% endif %} --file-check-frequency={{ pool.kubelet.frequency }}"
\ No newline at end of file
+DAEMON_ARGS="--require-kubeconfig --kubeconfig=/etc/kubernetes/kubelet.kubeconfig --config=/etc/kubernetes/manifests --allow-privileged={{ pool.kubelet.allow_privileged }} --cluster_dns={{ pool.cluster_dns }} --cluster_domain={{ pool.cluster_domain }} --v=2 {% if pool.network.engine == 'opencontrail' %}--network-plugin={{ pool.network.engine }}{% endif %} {% if pool.network.engine == 'calico' %}--network-plugin=cni --network-plugin-dir=/etc/cni/net.d{% endif %} --file-check-frequency={{ pool.kubelet.frequency }}"
diff --git a/kubernetes/files/kubelet/kubelet.kubeconfig b/kubernetes/files/kubelet/kubelet.kubeconfig
index 951288a..a33b7ba 100644
--- a/kubernetes/files/kubelet/kubelet.kubeconfig
+++ b/kubernetes/files/kubelet/kubelet.kubeconfig
@@ -9,12 +9,16 @@
     certificate-authority: /etc/kubernetes/ssl/kubelet-client.crt
     server: https://{{ pool.apiserver.host }}:443
   name: cluster.local
+- cluster:
+    certificate-authority: /etc/kubernetes/ssl/kubelet-client.crt
+    server: http://{{ pool.apiserver.host }}:8080
+  name: cluster-http.local
 contexts:
 - context:
-    cluster: cluster.local
+    cluster: cluster-http.local
     user: kubelet
   name: kubelet-to-cluster.local
 users:
 - name: kubelet
   user:
-    token: {{ pool.token.kubelet }}
\ No newline at end of file
+    token: {{ pool.token.kubelet }}