diff --git a/bootstrap/templates/ansible/inventory/group_vars/master/main.yaml.j2 b/bootstrap/templates/ansible/inventory/group_vars/controllers/main.yaml.j2
similarity index 100%
rename from bootstrap/templates/ansible/inventory/group_vars/master/main.yaml.j2
rename to bootstrap/templates/ansible/inventory/group_vars/controllers/main.yaml.j2
diff --git a/bootstrap/templates/ansible/inventory/group_vars/worker/.mjfilter.py b/bootstrap/templates/ansible/inventory/group_vars/workers/.mjfilter.py
similarity index 100%
rename from bootstrap/templates/ansible/inventory/group_vars/worker/.mjfilter.py
rename to bootstrap/templates/ansible/inventory/group_vars/workers/.mjfilter.py
diff --git a/bootstrap/templates/ansible/inventory/group_vars/worker/main.yaml.j2 b/bootstrap/templates/ansible/inventory/group_vars/workers/main.yaml.j2
similarity index 100%
rename from bootstrap/templates/ansible/inventory/group_vars/worker/main.yaml.j2
rename to bootstrap/templates/ansible/inventory/group_vars/workers/main.yaml.j2
diff --git a/bootstrap/templates/ansible/inventory/hosts.yaml.j2 b/bootstrap/templates/ansible/inventory/hosts.yaml.j2
index 950962ef..663991ca 100644
--- a/bootstrap/templates/ansible/inventory/hosts.yaml.j2
+++ b/bootstrap/templates/ansible/inventory/hosts.yaml.j2
@@ -1,7 +1,7 @@
 ---
 kubernetes:
   children:
-    master:
+    controllers:
       hosts:
         {% for item in nodes.inventory %}
         {% if item.controller %}
@@ -11,7 +11,7 @@ kubernetes:
         {% endif %}
         {% endfor %}
     {% if nodes.inventory | selectattr('controller', 'equalto', False) | list | length %}
-    worker:
+    workers:
       hosts:
         {% for item in nodes.inventory %}
         {% if not item.controller %}
diff --git a/bootstrap/templates/ansible/playbooks/cluster-kube-vip.yaml.j2 b/bootstrap/templates/ansible/playbooks/cluster-kube-vip.yaml.j2
index 439b00d8..e72b6ea6 100644
--- a/bootstrap/templates/ansible/playbooks/cluster-kube-vip.yaml.j2
+++ b/bootstrap/templates/ansible/playbooks/cluster-kube-vip.yaml.j2
@@ -1,6 +1,6 @@
 ---
 - name: Cluster kube-vip
-  hosts: master
+  hosts: controllers
   serial: 1
   become: true
   gather_facts: true
diff --git a/bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2 b/bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2
index d60e97a1..a6f91415 100644
--- a/bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2
+++ b/bootstrap/templates/ansible/playbooks/cluster-rollout-update.yaml.j2
@@ -13,7 +13,7 @@
     - name: Details
       ansible.builtin.command: "k3s kubectl get node {% raw %}{{ inventory_hostname }}{% endraw %} -o json"
       register: kubectl_get_node
-      delegate_to: "{% raw %}{{ groups['master'][0] }}{% endraw %}"
+      delegate_to: "{% raw %}{{ groups['controllers'][0] }}{% endraw %}"
       failed_when: false
       changed_when: false
 
@@ -29,7 +29,7 @@
             name: "{% raw %}{{ inventory_hostname }}{% endraw %}"
             kubeconfig: /etc/rancher/k3s/k3s.yaml
             state: cordon
-          delegate_to: "{% raw %}{{ groups['master'][0] }}{% endraw %}"
+          delegate_to: "{% raw %}{{ groups['controllers'][0] }}{% endraw %}"
 
         - name: Drain
           kubernetes.core.k8s_drain:
@@ -43,7 +43,7 @@
               wait_timeout: 900
             pod_selectors:
               - app!=rook-ceph-osd # Rook Ceph
-          delegate_to: "{% raw %}{{ groups['master'][0] }}{% endraw %}"
+          delegate_to: "{% raw %}{{ groups['controllers'][0] }}{% endraw %}"
 
         - name: Update
           ansible.builtin.apt:
@@ -67,4 +67,4 @@
             name: "{% raw %}{{ inventory_hostname }}{% endraw %}"
             kubeconfig: /etc/rancher/k3s/k3s.yaml
             state: uncordon
-          delegate_to: "{% raw %}{{ groups['master'][0] }}{% endraw %}"
+          delegate_to: "{% raw %}{{ groups['controllers'][0] }}{% endraw %}"