diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
index 9acc6a81e..9ac076500 100644
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
@@ -3,6 +3,10 @@ kind: NodeConfiguration
 caCertPath: {{ kube_config_dir }}/ssl/ca.crt
 token: {{ kubeadm_token }}
 discoveryTokenAPIServers:
+{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
+- {{ kubeadm_config_api_fqdn }}:6443
+{% else %}
 - {{ kubeadm_discovery_address | replace("https://", "")}}
+{% endif %}
 discoveryTokenCACertHashes:
 - sha256:{{ kubeadm_ca_hash.stdout }}
diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
index e2cd04a86..38ac215a2 100644
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
@@ -7,7 +7,11 @@ discoveryToken: {{ kubeadm_token }}
 tlsBootstrapToken: {{ kubeadm_token }}
 token: {{ kubeadm_token }}
 discoveryTokenAPIServers:
+{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
+- {{ kubeadm_config_api_fqdn }}:6443
+{% else %}
 - {{ kubeadm_discovery_address | replace("https://", "")}}
+{% endif %}
 discoveryTokenUnsafeSkipCAVerification: true
 nodeRegistration:
   name: {{ inventory_hostname  }}