diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index dd24a74..a0ae9dd 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -109,7 +109,7 @@
           - python3-rpi.gpio
 
   tasks:
-  - name: Create hostname
+  - name: Create hostname file
     copy:
       dest: "/etc/hostname"
       mode: 0644
@@ -117,13 +117,18 @@
       content: |
         line pwnagotchi
 
-  - name: add hostname to /etc/hosts
-    lineinfile:
-      dest: /etc/hosts
-      regexp: '^127\.0\.1\.1[ \t]+raspberrypi'
-      line: "127.0.1.1\t{{pwnagotchi.hostname}}"
-      state: present
-    when: hostname.changed
+  - name: create hosts file
+    copy:
+      dest: "/etc/hosts"
+      mode: 0644
+      owner: root
+      content: |
+        line 127.0.0.1       localhost
+        line ::1             localhost ip6-localhost ip6-loopback
+        line ff02::1         ip6-allnodes
+        line ff02::2         ip6-allrouters
+        line
+        line 127.0.1.1       pwnagotchi
 
   - name: disable sap plugin for bluetooth.service
     lineinfile: