diff --git a/playbooks/kubernetes/group_vars/all.yml b/playbooks/kubernetes/group_vars/all.yml
deleted file mode 100644
index 6d63c34..0000000
--- a/playbooks/kubernetes/group_vars/all.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-pod_network_cidr: "10.254.0.0/16"
-service_cidr: "10.255.0.0/16"
-kubeadmin_config: /etc/kubernetes/admin.conf
-k8s_version: 1.26
diff --git a/playbooks/kubernetes/group_vars/gerar.yaml b/playbooks/kubernetes/group_vars/gerar.yaml
deleted file mode 100644
index 53d24d9..0000000
--- a/playbooks/kubernetes/group_vars/gerar.yaml
+++ /dev/null
@@ -1 +0,0 @@
-ansible_user: servant
diff --git a/playbooks/kubernetes/inventory.yaml b/playbooks/kubernetes/inventory.yaml
index 6a61553..d622942 100644
--- a/playbooks/kubernetes/inventory.yaml
+++ b/playbooks/kubernetes/inventory.yaml
@@ -5,10 +5,22 @@ all:
         matthew.gerar.jilits.se:
         mark.gerar.jilits.se:
         luke.gerar.jilits.se:
+      vars:
+        ansible_user: servant
+        cluster_name: "gerar"
+        k8s_version: 1.26
+        pod_network_cidr: "10.254.0.0/16"
+        service_cidr: "10.255.0.0/16"
     control_planes:
       hosts:
         matthew.gerar.jilits.se:
-    workers:
+      vars:
+        is_control_plane: true
+    nodes:
       hosts:
         mark.gerar.jilits.se:
         luke.gerar.jilits.se:
+      vars:
+        is_control_plane: false
+  vars:
+    kubeadmin_config: /etc/kubernetes/admin.conf