diff --git a/kubernetes/files/kubelet/default.master b/kubernetes/files/kubelet/default.master
index d1f35d0..1e30e39 100644
--- a/kubernetes/files/kubelet/default.master
+++ b/kubernetes/files/kubelet/default.master
@@ -4,6 +4,7 @@
 # test_args has to be kept at the end, so they'll overwrite any prior configuration
 DAEMON_ARGS="\
 --pod-manifest-path=/etc/kubernetes/manifests \
+--address={{ master.kubelet.address }} \
 --allow-privileged={{ master.kubelet.allow_privileged }} \
 --cluster_dns={{ common.addons.dns.server }} \
 --cluster_domain={{ common.addons.dns.domain|replace('_', '-') }} \
diff --git a/kubernetes/files/kubelet/default.pool b/kubernetes/files/kubelet/default.pool
index 3ec835c..ea2f928 100644
--- a/kubernetes/files/kubelet/default.pool
+++ b/kubernetes/files/kubelet/default.pool
@@ -6,6 +6,7 @@
 --require-kubeconfig \
 --kubeconfig=/etc/kubernetes/kubelet.kubeconfig \
 --pod-manifest-path=/etc/kubernetes/manifests \
+--address={{ pool.kubelet.address }} \
 --allow-privileged={{ pool.kubelet.allow_privileged }} \
 --cluster_dns={{ common.addons.dns.server }} \
 --cluster_domain={{ common.addons.dns.domain|replace('_', '-') }} \
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index f267e5e..aa189f1 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -17,6 +17,7 @@
         username: ${_param:kubernetes_admin_user}
         password: ${_param:kubernetes_admin_password}
       kubelet:
+        address: ${_param:cluster_local_address}
         allow_privileged: True
       apiserver:
         address: ${_param:cluster_local_address}
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index fb9cfeb..4f9ad84 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -17,6 +17,7 @@
         username: ${_param:kubernetes_admin_user}
         password: ${_param:kubernetes_admin_password}
       kubelet:
+        address: ${_param:cluster_local_address}
         allow_privileged: True
       apiserver:
         address: ${_param:single_address}
diff --git a/metadata/service/pool/cluster.yml b/metadata/service/pool/cluster.yml
index b529623..826a78b 100644
--- a/metadata/service/pool/cluster.yml
+++ b/metadata/service/pool/cluster.yml
@@ -27,6 +27,7 @@
       cluster_dns: 10.254.0.10
       cluster_domain: ${_param:kubernetes_cluster_domain}
       kubelet:
+        address: ${_param:cluster_local_address}
         config: /etc/kubernetes/manifests
         allow_privileged: True
         frequency: 5s
diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index 057596b..eefb9ce 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -24,6 +24,7 @@
       allow_privileged: True
       cluster_domain: ${_param:kubernetes_cluster_domain}
       kubelet:
+        address: ${_param:cluster_local_address}
         config: /etc/kubernetes/manifests
         allow_privileged: True
         frequency: 5s
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index 50af461..2f40293 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -65,6 +65,7 @@
       - host: 10.0.175.100
         name: node040
     kubelet:
+      address: 10.0.175.100
       allow_privileged: true
     network:
       engine: calico
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index 4719e3d..b562e66 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -69,6 +69,7 @@
       - host: 10.0.175.100
         name: node040
     kubelet:
+      address: 10.0.175.100
       allow_privileged: true
     network:
       engine: opencontrail
diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index 9382438..fe63c4a 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -66,6 +66,7 @@
       - host: 127.0.0.1
         name: node040
     kubelet:
+      address: 10.0.175.100
       allow_privileged: true
     network:
       engine: opencontrail
diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index c22b8c1..35523bb 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.sls
@@ -39,6 +39,7 @@
         - host: 127.0.0.1
     address: 0.0.0.0
     kubelet:
+      address: 127.0.0.1
       config: /etc/kubernetes/manifests
       allow_privileged: True
       frequency: 5s
diff --git a/tests/pillar/pool_cluster_with_domain.sls b/tests/pillar/pool_cluster_with_domain.sls
index 877540e..595e39e 100644
--- a/tests/pillar/pool_cluster_with_domain.sls
+++ b/tests/pillar/pool_cluster_with_domain.sls
@@ -40,6 +40,7 @@
         - host: 127.0.0.1
     address: 0.0.0.0
     kubelet:
+      address: 127.0.0.1
       config: /etc/kubernetes/manifests
       allow_privileged: True
       frequency: 5s
diff --git a/tests/pillar/pool_contrail4_0.sls b/tests/pillar/pool_contrail4_0.sls
index 32d6ce9..bdd87b7 100644
--- a/tests/pillar/pool_contrail4_0.sls
+++ b/tests/pillar/pool_contrail4_0.sls
@@ -39,6 +39,7 @@
         - host: 127.0.0.1
     address: 0.0.0.0
     kubelet:
+      address: 127.0.0.1
       config: /etc/kubernetes/manifests
       allow_privileged: True
       frequency: 5s