diff --git a/ansible/group_vars/localhost.yaml b/ansible/group_vars/localhost.yaml
deleted file mode 100644
index 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000
--- a/ansible/group_vars/localhost.yaml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ansible/group_vars/nodes.yaml b/ansible/group_vars/nodes.yaml
deleted file mode 100644
index 529ff50a9e364281b94dd9a1f545f9ade20f0998..0000000000000000000000000000000000000000
--- a/ansible/group_vars/nodes.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# General config
-bin_dir: /usr/local/bin
-systemd_dir: /etc/systemd/system
-storage_dir: /var/lib
-
-# Hepto deployment
-hepto_version: 79361
-hepto_url: "https://forge.tedomum.net/acides/hepto/-/jobs/{{ hepto_version }}/artifacts/raw/hepto"
-
-# Cluster and node settings
-cluster_name: hepto
-node_name: "{{ inventory_hostname }}"
-node_iface: eth0
-kubeconfig: "{{ storage_dir }}/{{ cluster_name }}/{{ node_name }}/kubeconfig"
-
-# Dynamic variables based on groups
-node_role: "{{ 'master' if 'master' in group_names else 'node' }}"
-cluster_anchor: "{{ groups['anchor'] | map('extract', hostvars, 'node_ip') | list | ansible.utils.ipaddr('address') | first }}"
-external_ips: "{{ groups['public'] | map('extract', hostvars, 'node_ip') | list | ansible.utils.ipaddr('address') }}"
diff --git a/ansible/roles/hepto/defaults/main.yaml b/ansible/roles/hepto/defaults/main.yaml
index 2a1247c1f522fd21189cac4b0ed3d055d988b2ae..6dc75864c346b5aa3b7dcb6988b45d8aa427a7d9 100644
--- a/ansible/roles/hepto/defaults/main.yaml
+++ b/ansible/roles/hepto/defaults/main.yaml
@@ -1,2 +1,22 @@
+# General config
+bin_dir: /usr/local/bin
+systemd_dir: /etc/systemd/system
+storage_dir: /var/lib
+
 hepto_bin: "{{ bin_dir }}/hepto.{{ hepto_version }}"
 config_file: "/etc/{{ cluster_name }}/{{ node_name }}"
+
+# Hepto deployment
+hepto_version: 79361
+hepto_url: "https://forge.tedomum.net/acides/hepto/-/jobs/{{ hepto_version }}/artifacts/raw/hepto"
+
+# Cluster and node settings
+cluster_name: hepto
+node_name: "{{ inventory_hostname }}"
+node_iface: eth0
+kubeconfig: "{{ storage_dir }}/{{ cluster_name }}/{{ node_name }}/kubeconfig"
+
+# Dynamic variables based on groups
+node_role: "{{ 'master' if 'master' in group_names else 'node' }}"
+cluster_anchor: "{{ groups['anchor'] | map('extract', hostvars, 'node_ip') | list | ansible.utils.ipaddr('address') | first }}"
+external_ips: "{{ groups['public'] | map('extract', hostvars, 'node_ip') | list | ansible.utils.ipaddr('address') }}"