diff --git a/readme.md b/readme.md
index 7aa7161..a8d5e82 100644
--- a/readme.md
+++ b/readme.md
@@ -16,6 +16,7 @@ This role manages the build-in 'core' Operating System components and defaults t
 - cron
 - environment-file
 - hostname
+- hostfile
 - firewall
 - journald
 - locale
diff --git a/tasks/hostname.yaml b/tasks/hostname.yaml
index 6020e96..3227d81 100644
--- a/tasks/hostname.yaml
+++ b/tasks/hostname.yaml
@@ -3,7 +3,18 @@
 # set hostname
 - name: "set hostname"
   ansible.builtin.hostname:
-    name: "{{ set_hostname | default(inventory_hostname) }}"
+    name: "{{ set_hostname | default(inventory_hostname_short) }}"
     use: "{{ hostname_use_method }}"
   tags:
     - "hostname"
+
+# manage /etc/hosts file
+- name: "manage /etc/hosts file for hostname"
+  ansible.builtin.lineinfile:
+    path: "/etc/hosts"
+    regexp: '^{{ ansible_default_ipv4.address }}\s+.*{{ inventory_hostname_short }}.*$'
+    line: "{{ ansible_default_ipv4.address }} {{ inventory_hostname }} {{ inventory_hostname_short }}"
+    backup: true
+  tags:
+    - "hostfile"
+    - "hostname"