diff --git a/templates/bootstrap/node/ansible/tasks/load_node.yaml b/templates/bootstrap/node/ansible/tasks/load_node.yaml
index 9aba2a03..7d89f9ab 100644
--- a/templates/bootstrap/node/ansible/tasks/load_node.yaml
+++ b/templates/bootstrap/node/ansible/tasks/load_node.yaml
@@ -15,6 +15,7 @@
     ip: "{{ node[1] }}"
     access_ip: "{{ node[1] }}"
     name: "{{ node[0] }}.control.box.netai-cloud"
+    kube_override_hostname: "{{ node[0] }}.control.box.netai-cloud"
     groups:
       - all
       - kube_control_plane
diff --git a/templates/bootstrap/node/entrypoint.sh b/templates/bootstrap/node/entrypoint.sh
index 983d46b7..46fa20bf 100644
--- a/templates/bootstrap/node/entrypoint.sh
+++ b/templates/bootstrap/node/entrypoint.sh
@@ -43,10 +43,5 @@ cp /etc/resolv.conf /tmp/resolv.conf &&
     umount /etc/resolv.conf &&
     mv /tmp/resolv.conf /etc/resolv.conf
 
-# Append hostname to /etc/hosts
-echo -e "\n# Kiss bootstrap hosts BEGIN" >>/etc/hosts
-echo -e "127.0.0.94\t$(hostname)" >>/etc/hosts
-echo -e "# Kiss bootstrap hosts END\n" >>/etc/hosts
-
 # Execute systemd
 exec /usr/sbin/init
diff --git a/templates/kiss/tasks/common/playbook.yaml b/templates/kiss/tasks/common/playbook.yaml
index a5e2caee..473a5fa3 100644
--- a/templates/kiss/tasks/common/playbook.yaml
+++ b/templates/kiss/tasks/common/playbook.yaml
@@ -21,6 +21,7 @@
         ansible_ipmi_username: "{{ lookup('env', 'ansible_ipmi_username') }}"
         ansible_ipmi_password: "{{ lookup('env', 'ansible_ipmi_password') }}"
         name: "{{ lookup('env', 'ansible_host') }}"
+        kube_override_hostname: "{{ lookup('env', 'ansible_host') }}"
         groups:
           - all
           - flatcar