diff --git a/roles/kubernetes/client/tasks/main.yml b/roles/kubernetes/client/tasks/main.yml
index 8afb5c530..2d5db3e80 100644
--- a/roles/kubernetes/client/tasks/main.yml
+++ b/roles/kubernetes/client/tasks/main.yml
@@ -2,13 +2,13 @@
 - name: Set external kube-apiserver endpoint
   set_fact:
     external_apiserver_address: >-
-      {%- if loadbalancer_apiserver is defined and loadbalancer_apiserver.port is defined -%}
-      {{ apiserver_loadbalancer_domain_name }}
+      {%- if loadbalancer_apiserver is defined and loadbalancer_apiserver.address is defined -%}
+      {{ loadbalancer_apiserver.address }}
       {%- else -%}
       {{ kube_apiserver_access_address }}
       {%- endif -%}
     external_apiserver_port: >-
-      {%- if loadbalancer_apiserver is defined and loadbalancer_apiserver.port is defined -%}
+      {%- if loadbalancer_apiserver is defined and loadbalancer_apiserver.address and loadbalancer_apiserver.port is defined -%}
       {{ loadbalancer_apiserver.port|default(kube_apiserver_port) }}
       {%- else -%}
       {{ kube_apiserver_port }}