diff --git a/k3s/ansible.cfg b/k3s/ansible.cfg
index 5a2e71d..385d258 100644
--- a/k3s/ansible.cfg
+++ b/k3s/ansible.cfg
@@ -1,5 +1,5 @@
 [defaults]
 nocows = True
-inventory = inventory.ini
+inventory = inventory.ini,config.ini
 display_skipped_hosts = False
 error_on_undefined_vars = True
diff --git a/k3s/config.ini b/k3s/config.ini
new file mode 100644
index 0000000..6fb7d58
--- /dev/null
+++ b/k3s/config.ini
@@ -0,0 +1,16 @@
+[all:vars]
+k8s_api_endpoint = "{{ hostvars[groups['server'][0]]['ansible_host'] | default(groups['server'][0]) }}"
+
+[k3s_cluster:vars]
+ansible_user = root
+# note the space between the IPs!
+dns_servers = 8.8.8.8 8.8.4.4
+
+[agent:vars]
+ansible_ssh_common_args = -o StrictHostKeyChecking=accept-new -o ProxyCommand="ssh -p 1022 -W %h:%p -q root@{{ k8s_api_endpoint }}"
+k3s_version = v1.31.6+k3s1
+
+[server:vars]
+ansible_ssh_common_args = '-o StrictHostKeyChecking=accept-new'
+ansible_port = 1022
+k3s_version = v1.31.6+k3s1
diff --git a/k3s/group_vars/agent/config.yml b/k3s/group_vars/agent/config.yml
deleted file mode 100644
index f508f29..0000000
--- a/k3s/group_vars/agent/config.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-ansible_ssh_common_args: -o StrictHostKeyChecking=accept-new -o ProxyCommand="ssh -p 1022 -W %h:%p -q root@{{ hostvars[groups['server'][0]]['ansible_host'] | default(groups['server'][0]) }}"
-ansible_port: 22
-k3s_version: v1.31.6+k3s1
diff --git a/k3s/group_vars/k3s_cluster/config.yml b/k3s/group_vars/k3s_cluster/config.yml
deleted file mode 100644
index 57bf432..0000000
--- a/k3s/group_vars/k3s_cluster/config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-ansible_user: root
-api_endpoint: "{{ hostvars[groups['server'][0]]['ansible_host'] | default(groups['server'][0]) }}"
-
-# note the space between the IPs!
-dns_servers: 8.8.8.8 8.8.4.4
diff --git a/k3s/group_vars/server/config.yml b/k3s/group_vars/server/config.yml
deleted file mode 100644
index f78b458..0000000
--- a/k3s/group_vars/server/config.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-ansible_ssh_common_args: '-o StrictHostKeyChecking=accept-new'
-ansible_port: 1022
-k3s_version: v1.31.6+k3s1
diff --git a/k3s/roles/kube-config/tasks/main.yml b/k3s/roles/kube-config/tasks/main.yml
index a6fb9f5..28cc040 100644
--- a/k3s/roles/kube-config/tasks/main.yml
+++ b/k3s/roles/kube-config/tasks/main.yml
@@ -2,18 +2,18 @@
   fetch:
     src: /etc/rancher/k3s/k3s.yaml
     dest: "{{ lookup('env', 'HOME') }}/.kube/config.orig"
-    flat: true
+    flat: True
   register: loaded_kube_config
 - name: Copy kube-config to correct location
   delegate_to: localhost
   copy:
     src: "{{ lookup('env', 'HOME') }}/.kube/config.orig"
     dest: "{{ lookup('env', 'HOME') }}/.kube/config"
-  when: hostvars[groups['server'][0]]['loaded_kube_config'] is changed
+  when: loaded_kube_config is changed
 - name: Use correct ip-address for k8s-cluster
   delegate_to: localhost
   lineinfile:
     path: "{{ lookup('env', 'HOME') }}/.kube/config"
     regexp: '^(\s*server: https://).*(:\d+)$'
-    line: \g<1>{{ hostvars[groups['server'][0]]['api_endpoint'] }}\g<2>
+    line: \g<1>{{ k8s_api_endpoint }}\g<2>
     backrefs: yes