diff --git a/default.yml b/default.yml
index 9ecb181..aace94b 100644
--- a/default.yml
+++ b/default.yml
@@ -15,7 +15,7 @@
       tags: network
 
     - name: Network host specific provisioning
-      ansible.builtin.import_tasks: "tasks/network/{{ ansible_hostname }}.yml"
+      ansible.builtin.import_tasks: "tasks/network/{{ hostname }}.yml"
       tags: network-specific
 
     - name: Systemd provisioning
diff --git a/desktop.yml b/desktop.yml
index 71b58d0..a2f9da8 100644
--- a/desktop.yml
+++ b/desktop.yml
@@ -1,10 +1,13 @@
 ---
+- name: Include default playbook
+  ansible.builtin.import_playbook: default.yml
+  vars:
+    hostname: desktop
+
 - name: Arch Linux provisioning
   hosts: desktop
+  gather_facts: true
   tasks:
-    - name: Include default playbook
-      ansible.builtin.import_playbook: default.yml
-
     - name: Wireguard provisioning
       ansible.builtin.import_tasks: "tasks/wireguard.yml"
       tags: wireguard
diff --git a/htpc.yml b/htpc.yml
index 5c44b81..148c470 100644
--- a/htpc.yml
+++ b/htpc.yml
@@ -1,12 +1,12 @@
 ---
-- hosts: htpc
-  gather_facts: true
-
 - name: Include default playbook
   ansible.builtin.import_playbook: default.yml
+  vars:
+    hostname: htpc
 
 - name: Arch Linux provisioning
   hosts: htpc
+  gather_facts: true
   tasks:
     - name: Wireguard media provisioning
       ansible.builtin.import_tasks: "tasks/wireguard-media.yml"
diff --git a/xps.yml b/xps.yml
index 976e7ac..ffb2265 100644
--- a/xps.yml
+++ b/xps.yml
@@ -1,6 +1,8 @@
 ---
 - name: Include default playbook
   ansible.builtin.import_playbook: default.yml
+  vars:
+    hostname: xps
 
 - name: Arch Linux provisioning
   hosts: xps