diff --git a/evolinux-base/tasks/hostname.yml b/evolinux-base/tasks/hostname.yml
index 4acb944d..b73c11c7 100644
--- a/evolinux-base/tasks/hostname.yml
+++ b/evolinux-base/tasks/hostname.yml
@@ -20,7 +20,7 @@
   lineinfile:
     dest: /etc/hosts
     regexp: '^{{ ansible_default_ipv4.address }}\s+'
-    line: "{{ ansible_default_ipv4.address }}    {{ evolinux_fqdn }} {{ evolinux_hostname }}"
+    line: "{{ ansible_default_ipv4.address }}    {{ [evolinux_fqdn, evolinux_internal_fqdn] | unique | join(' ') }} {{ [evolinux_hostname, evolinux_internal_hostname] | unique | join(' ') }}"
     insertafter: '127.0.0.1\s+localhost.localdomain'
   when: evolinux_hostname_hosts