diff --git a/tasks/main.yml b/tasks/main.yml
index 74b775d74c48521412978a7d48ce8cff86a6ed3a..07a853a1f07f55945f6552eab30caaf18c629489 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -18,9 +18,10 @@
     - name: Update /etc/hosts to use new hostname
       lineinfile:
         dest: /etc/hosts
-        regexp: '^127.0.1.1'
-        line: '127.0.1.1 {{ hostname }}'
+        regexp: '^127.0.1.1\s{{ hostname }}'
+        line: "127.0.1.1\t{{ hostname }}"
         state: present
+        insertafter: "^127.0.0.1\t"
     - name: Set 'ansible_hostname' fact to the new hostname
       set_fact:
         ansible_hostname: '{{ hostname }}'