diff --git a/home-assistant.yml b/home-assistant.yml
index ed44ab3..c7b398d 100644
--- a/home-assistant.yml
+++ b/home-assistant.yml
@@ -3,38 +3,17 @@
   hosts: home-assistant
 
   vars_files:
+    - vars/secrets.yaml
+    - vars/zha-devices.yml
+    - vars/zwave-devices.yml
+    - vars/battery.yml
+    - vars/availability.yml
+    - vars/shopping-list.yml
+    - vars/lights-automations.yml
 
   pre_tasks:
     - import_tasks: tasks/clean.yml
 
-    - name: Include secrets
-      include_vars:
-        file: vars/secrets.yaml
-
-    - name: Include ZHA vars
-      include_vars:
-        file: vars/zha-devices.yml
-
-    - name: Include Z-wave vars
-      include_vars:
-        file: vars/zwave-devices.yml
-
-    - name: Include battery vars
-      include_vars:
-        file: vars/battery.yml
-
-    - name: Include availability vars
-      include_vars:
-        file: vars/availability.yml
-
-    - name: Include shopping list
-      include_vars:
-        file: vars/shopping-list.yml
-
-    - name: Include light list for automations
-      include_vars:
-        file: vars/lights-automations.yml
-
   roles:
     - automations
     - scripts