diff --git a/ansible/roles/k3s/master/tasks/main.yml b/ansible/roles/k3s/master/tasks/main.yml
index 7fa185d..094544e 100644
--- a/ansible/roles/k3s/master/tasks/main.yml
+++ b/ansible/roles/k3s/master/tasks/main.yml
@@ -6,7 +6,7 @@
     owner: root
     group: root
     mode: 0644
-  when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname']
+  when: ansible_hostname == groups[master_group][0]
 
 - name: Copy vip rbac manifest to first master
   template:
@@ -15,7 +15,7 @@
     owner: root
     group: root
     mode: 0644
-  when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname']
+  when: ansible_hostname == groups[master_group][0]
 
 - name: Copy vip manifest to first master
   template:
@@ -24,7 +24,7 @@
     owner: root
     group: root
     mode: 0644
-  when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname']
+  when: ansible_hostname == groups[master_group][0]
 
 - name: Init cluster inside the transient k3s-init service
   command:
diff --git a/ansible/roles/k3s/vars/main.yaml b/ansible/roles/k3s/vars/main.yaml
index 672917d..5ff2349 100644
--- a/ansible/roles/k3s/vars/main.yaml
+++ b/ansible/roles/k3s/vars/main.yaml
@@ -51,3 +51,5 @@ kube_vip_tag_version: "v0.7.2"
 username: "administrator"
 
 environment: "{{ lookup('env','ENVIRONMENT_NAME') }}"
+master_group: "{{ (cluster | regex_replace('-cluster$', '')) ~ '-master' }}"
+node_group: "{{ (cluster | regex_replace('-cluster$', '')) ~ '-node' }}"