diff --git a/tasks/install_server.yml b/tasks/install_server.yml
index 985a5b1..1fd872a 100644
--- a/tasks/install_server.yml
+++ b/tasks/install_server.yml
@@ -64,10 +64,19 @@
 - name: Retreive kubeadm Major version
   shell: kubeadm version | sed 's/.*{Major:"\([0-9]\)".*/\1/'
   register: kubeadm_version_major
+  changed_when: False
 
 - name: Retreive kubeadm Minor version
   shell: kubeadm version | sed -e 's/.* Minor:"\([0-9]*\)".*/\1/'
   register: kubeadm_version_minor
+  changed_when: False
+
+- set_fact:
+    lb_kubemaster: "groups['KubernetesMasterConfigured'][0]"
+  when:
+    - lb_kubemaster is undefined
+#    - groups['KubernetesMasters'] | length > 1
+  changed_when: False
 
 - name: Deploy initial kubeadm config
   template:
@@ -97,11 +106,6 @@
     - groups['KubernetesMasterConfigured'] is not defined
     - groups['KubernetesMasters'][0] == ansible_hostname
 
-- set_fact:
-    lb_kubemaster: "groups['KubernetesMasterConfigured'][0]"
-  when:
-    - groups['KubernetesMasters'] | length > 1
-
 - name: Test if server node already included
   command: kubectl --kubeconfig=/etc/kubernetes/admin.conf get nodes {{ ansible_hostname | lower }}
   delegate_to: "{{ lb_kubemaster }}"
diff --git a/templates/kubeadm-config.yaml.j2 b/templates/kubeadm-config.yaml.j2
index 68bc5e1..310987c 100644
--- a/templates/kubeadm-config.yaml.j2
+++ b/templates/kubeadm-config.yaml.j2
@@ -68,6 +68,9 @@ kubernetesVersion: stable
 controlPlaneEndpoint: "{{ lb_kubemaster }}:6443"
 apiServer:
   certSANs:
+  - "{{ lb_kubemaster }}"
+{% if false %}
   - "{{ lbip_kubeapiserver }}"
+{% endif %}
 networking:
   podSubnet: "10.244.0.0/16"