diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index e248a7724d7..ef20df8f110 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -5,9 +5,9 @@
 
 {% if grains.apiservers is defined -%}
   {% set apiservers = "--api_servers=https://" + grains.apiservers + ":6443" -%}
-{% else -%}
-  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
-  {% set apiservers = "--api_servers=https://" + ips[0][0] + ":6443" -%}
+{% elif grains['roles'][0] == 'kubernetes-master' -%}
+  {% set master_ipv4 = salt['grains.get']('fqdn_ip4')[0] -%}
+  {% set apiservers = "--api_servers=https://" + master_ipv4 + ":6443" -%}
 {% endif -%}
 
 {% set address = "--address=0.0.0.0" -%}