diff --git a/host_vars/desktop/network.yml b/host_vars/desktop/network.yml
index 8470e20..22f1abb 100644
--- a/host_vars/desktop/network.yml
+++ b/host_vars/desktop/network.yml
@@ -4,5 +4,3 @@ lan_interface_mac: 00:d8:61:9f:52:65
 local_network_address: 192.168.2.15/24
 local_network_dns: 192.168.2.254
 local_network_gateway: 192.168.2.254
-
-hostname: desktop
diff --git a/host_vars/xps/network.yml b/host_vars/xps/network.yml
index ecddca8..03ad73b 100644
--- a/host_vars/xps/network.yml
+++ b/host_vars/xps/network.yml
@@ -5,5 +5,3 @@ local_network_ssid: KPNAE51C6
 local_network_address: 192.168.2.9/24
 local_network_dns: 192.168.2.254
 local_network_gateway: 192.168.2.254
-
-hostname: xps
diff --git a/playbook.yml b/playbook.yml
index 3108293..1d25070 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -16,6 +16,7 @@
       ansible.builtin.import_tasks: 'tasks/setup.yml'
       tags: setup
 
+    # TODO: add hostname provisioning
     - name: Network provisioning
       ansible.builtin.import_tasks: 'tasks/network.yml'
       tags: network
diff --git a/tasks/network.yml b/tasks/network.yml
index fa4a975..0fdda79 100644
--- a/tasks/network.yml
+++ b/tasks/network.yml
@@ -3,25 +3,11 @@
 # using `wg set wg0 peer izHzmRwh2yzICps6pFI2Bg3TnmTD66/8uH4loJpkuD4= endpoint <NEW-IP>:<PORT>`
 # for example.
 
-- name: Set hostname
-  become: true
-  ansible.builtin.hostname:
-    name: '{{ hostname }}'
-    use: systemd
-
-- name: Copy hosts file
-  become: true
-  ansible.builtin.template:
-    src: templates/hosts.j2
-    dest: /etc/hosts
-    mode: '0644'
-    owner: root
-
 - name: Copy firewall template
   become: true
   ansible.builtin.template:
     src: "{{ lookup('ansible.builtin.first_found', paths) }}"
-    dest: /etc/nftables.conf
+    dest: '/etc/nftables.conf'
     owner: root
     group: root
     mode: '0600'
diff --git a/templates/hosts.j2 b/templates/hosts.j2
deleted file mode 100644
index 58cf68c..0000000
--- a/templates/hosts.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-# {{ ansible_managed }}
-
-127.0.0.1   localhost.localdomain localhost
-127.0.1.1   localhost.localdomain {{ hostname }}
-::1         localhost.localdomain localhost
diff --git a/templates/personal/xps/network/wlan0-local.network.j2 b/templates/personal/xps/network/wlan0-local.network.j2
index 99f1eb3..9e41426 100644
--- a/templates/personal/xps/network/wlan0-local.network.j2
+++ b/templates/personal/xps/network/wlan0-local.network.j2
@@ -10,5 +10,7 @@ DNS={{ local_network_dns }}
 Gateway={{ local_network_gateway }}
 DHCP=no
 IPv6AcceptRA=no
-MulticastDNS=yes
 RequiredForOnline=routable
+
+[Link]
+MulticastDNS=yes