diff --git a/tasks/platform.yml b/tasks/platform.yml
index 66e96cd..bad51f3 100644
--- a/tasks/platform.yml
+++ b/tasks/platform.yml
@@ -14,9 +14,11 @@
   when: is_laptop.rc == 0
 
 - name: Load desktop specific vars
-  ansible.builtin.include_vars: 'vars/desktop.yml'
+  ansible.builtin.include_vars:
+    dir: vars/desktop
   when: platform == "desktop"
 
 - name: Load laptop specific vars
-  ansible.builtin.include_vars: 'vars/laptop.yml'
+  ansible.builtin.include_vars:
+    dir: vars/laptop
   when: platform == "laptop"
diff --git a/vars/desktop/system.yml b/vars/desktop/system.yml
new file mode 100644
index 0000000..61a2959
--- /dev/null
+++ b/vars/desktop/system.yml
@@ -0,0 +1,19 @@
+platform_packages: []
+
+modprobe_templates:
+  - src: 'templates/desktop/modprobe/99-amdgpu.conf.j2'
+    dest: '/etc/modprobe.d/99-amdgpu.conf'
+
+mkinitcpio_templates:
+  - src: 'templates/desktop/mkinitcpio/1-modules.conf.j2'
+    dest: '/etc/mkinitcpio.conf.d/1-amdgpu.conf'
+
+  - src: 'templates/desktop/mkinitcpio/linux.preset.j2'
+    dest: '/etc/mkinitcpio.d/linux.preset'
+
+  - src: 'templates/desktop/mkinitcpio/linux-lts.preset.j2'
+    dest: '/etc/mkinitcpio.d/linux-lts.preset'
+
+boot_configuration:
+  disk: /dev/sdc
+  partition: 1
diff --git a/vars/desktop.yml b/vars/desktop/vpn.yml
similarity index 74%
rename from vars/desktop.yml
rename to vars/desktop/vpn.yml
index 6a22f27..e5f97d6 100644
--- a/vars/desktop.yml
+++ b/vars/desktop/vpn.yml
@@ -1,23 +1,3 @@
-platform_packages: []
-
-modprobe_templates:
-  - src: 'templates/desktop/modprobe/99-amdgpu.conf.j2'
-    dest: '/etc/modprobe.d/99-amdgpu.conf'
-
-mkinitcpio_templates:
-  - src: 'templates/desktop/mkinitcpio/1-modules.conf.j2'
-    dest: '/etc/mkinitcpio.conf.d/1-amdgpu.conf'
-
-  - src: 'templates/desktop/mkinitcpio/linux.preset.j2'
-    dest: '/etc/mkinitcpio.d/linux.preset'
-
-  - src: 'templates/desktop/mkinitcpio/linux-lts.preset.j2'
-    dest: '/etc/mkinitcpio.d/linux-lts.preset'
-
-boot_configuration:
-  disk: /dev/sdc
-  partition: 1
-
 # TODO: scope variables to their destination file
 vpn_default:
   ip: '10.0.0.3'
diff --git a/vars/laptop/system.yml b/vars/laptop/system.yml
new file mode 100644
index 0000000..be95be8
--- /dev/null
+++ b/vars/laptop/system.yml
@@ -0,0 +1,23 @@
+platform_packages:
+  - iwd
+  - nvidia
+  - nvidia-prime
+  - nvidia-utils
+  - lib32-nvidia-utils
+
+boot_configuration:
+  disk: /dev/nvme0n1
+  partition: 1
+
+mkinitcpio_templates:
+  - src: 'templates/laptop/mkinitcpio/1-modules.conf.j2'
+    dest: '/etc/mkinitcpio.conf.d/1-modules.conf'
+
+  - src: 'templates/laptop/mkinitcpio/2-hooks.conf.j2'
+    dest: '/etc/mkinitcpio.conf.d/2-hooks.conf'
+
+  - src: 'templates/laptop/mkinitcpio/linux.preset.j2'
+    dest: '/etc/mkinitcpio.d/linux.preset'
+
+  - src: 'templates/laptop/mkinitcpio/linux-lts.preset.j2'
+    dest: '/etc/mkinitcpio.d/linux-lts.preset'
diff --git a/vars/laptop.yml b/vars/laptop/vpn.yml
similarity index 70%
rename from vars/laptop.yml
rename to vars/laptop/vpn.yml
index cc46761..44aeccb 100644
--- a/vars/laptop.yml
+++ b/vars/laptop/vpn.yml
@@ -1,27 +1,3 @@
-platform_packages:
-  - iwd
-  - nvidia
-  - nvidia-prime
-  - nvidia-utils
-  - lib32-nvidia-utils
-
-boot_configuration:
-  disk: /dev/nvme0n1
-  partition: 1
-
-mkinitcpio_templates:
-  - src: 'templates/laptop/mkinitcpio/1-modules.conf.j2'
-    dest: '/etc/mkinitcpio.conf.d/1-modules.conf'
-
-  - src: 'templates/laptop/mkinitcpio/2-hooks.conf.j2'
-    dest: '/etc/mkinitcpio.conf.d/2-hooks.conf'
-
-  - src: 'templates/laptop/mkinitcpio/linux.preset.j2'
-    dest: '/etc/mkinitcpio.d/linux.preset'
-
-  - src: 'templates/laptop/mkinitcpio/linux-lts.preset.j2'
-    dest: '/etc/mkinitcpio.d/linux-lts.preset'
-
 vpn_default:
   ip: '10.0.0.2'
   prefix: '24'