diff --git a/coreos-config/vars/vault.yaml b/coreos-config/group_vars/all/vault.yaml
similarity index 100%
rename from coreos-config/vars/vault.yaml
rename to coreos-config/group_vars/all/vault.yaml
diff --git a/coreos-config/vars/wireguard-peers.yaml b/coreos-config/group_vars/all/wireguard-peers.yaml
similarity index 100%
rename from coreos-config/vars/wireguard-peers.yaml
rename to coreos-config/group_vars/all/wireguard-peers.yaml
diff --git a/coreos-config/playbook.yaml b/coreos-config/playbook.yaml
index d269dde..7f024bd 100644
--- a/coreos-config/playbook.yaml
+++ b/coreos-config/playbook.yaml
@@ -8,12 +8,6 @@
     render_blacklist:
       - EMPTY
   tasks:
-    - name: Read Variables
-      include_vars:
-        dir: vars
-        extensions:
-          - 'yml'
-          - 'yaml'
     - file:
         state: absent
         dest: '{{ render_path }}'
@@ -46,12 +40,6 @@
   become: true
   become_user: root
   tasks:
-    - name: Read Variables
-      include_vars:
-        dir: vars
-        extensions:
-          - 'yml'
-          - 'yaml'
     - name: Install backup script
       ansible.builtin.template:
         src: backup.sh.j2
@@ -82,12 +70,6 @@
   gather_facts: true
   tasks:
     - block:
-        - name: Read Variables
-          include_vars:
-            dir: vars
-            extensions:
-              - 'yml'
-              - 'yaml'
         - name: Install backup script
           ansible.builtin.template:
             src: restore.sh.j2